Author: matt
Date: 2009-09-28 07:41:43 -0700 (Mon, 28 Sep 2009)
New Revision: 6909
Log:
Added missing NO_OVERLAY flag form Fl_Menu_Window (part 2)

Modified:
   branches/branch-1.3/FL/Fl_Menu_Window.H
   branches/branch-1.3/src/Fl_Text_Display.cxx

Modified: branches/branch-1.3/FL/Fl_Menu_Window.H
===================================================================
--- branches/branch-1.3/FL/Fl_Menu_Window.H     2009-09-28 14:41:22 UTC (rev 
6908)
+++ branches/branch-1.3/FL/Fl_Menu_Window.H     2009-09-28 14:41:43 UTC (rev 
6909)
@@ -40,14 +40,13 @@
   redraw.
 */
 class FL_EXPORT Fl_Menu_Window : public Fl_Single_Window {
-  enum {NO_OVERLAY = 128};
 public:
   void show();
   void erase();
   void flush();
   void hide();
   /** Tells if hardware overlay mode is set */
-  int overlay() {return !(flags()&NO_OVERLAY);}
+  unsigned int overlay() {return !(flags()&NO_OVERLAY);}
   /** Tells FLTK to use hardware overlay planes if they are available.  */
   void set_overlay() {clear_flag(NO_OVERLAY);}
   /** Tells FLTK to use normal drawing planes instead of overlay planes.

Modified: branches/branch-1.3/src/Fl_Text_Display.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Text_Display.cxx 2009-09-28 14:41:22 UTC (rev 
6908)
+++ branches/branch-1.3/src/Fl_Text_Display.cxx 2009-09-28 14:41:43 UTC (rev 
6909)
@@ -387,8 +387,8 @@
     mMaxsize = max(mMaxsize, fl_height(mStyleTable[i].font, 
mStyleTable[i].size));
 
   // did we have scrollbars initially?
-  int hscrollbarvisible = mHScrollBar->visible();
-  int vscrollbarvisible = mVScrollBar->visible();
+  unsigned int hscrollbarvisible = mHScrollBar->visible();
+  unsigned int vscrollbarvisible = mVScrollBar->visible();
 
   // try without scrollbars first
   mVScrollBar->clear_visible();

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to