diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2009-09-28 14:41:43 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2009-09-28 14:41:43 +0000 |
| commit | f1ef3c10477609be6bea13f7e49d137631fa9297 (patch) | |
| tree | 0999ce101360b38ab5ac10fa9eb12b695475b5b8 | |
| parent | e283dfe91cc93d7ef7e8bb8bfe0d2997065a4612 (diff) | |
Added missing NO_OVERLAY flag form Fl_Menu_Window (part 2)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6909 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Menu_Window.H | 3 | ||||
| -rw-r--r-- | src/Fl_Text_Display.cxx | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/FL/Fl_Menu_Window.H b/FL/Fl_Menu_Window.H index f56fe3ea8..891691b20 100644 --- a/FL/Fl_Menu_Window.H +++ b/FL/Fl_Menu_Window.H @@ -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. diff --git a/src/Fl_Text_Display.cxx b/src/Fl_Text_Display.cxx index 77bc70254..4a9817998 100644 --- a/src/Fl_Text_Display.cxx +++ b/src/Fl_Text_Display.cxx @@ -387,8 +387,8 @@ void Fl_Text_Display::resize(int X, int Y, int W, int H) { 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(); |