summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--FL/Fl_Widget.H2
-rw-r--r--src/Fl_cocoa.mm2
2 files changed, 1 insertions, 3 deletions
diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H
index 913116a0e..27e6801c2 100644
--- a/FL/Fl_Widget.H
+++ b/FL/Fl_Widget.H
@@ -148,7 +148,6 @@ protected:
void set_flag(unsigned int c) {flags_ |= c;}
/** Clears a flag in the flags mask */
void clear_flag(unsigned int c) {flags_ &= ~c;}
-public:
/** flags possible values enumeration.
See activate(), output(), visible(), changed(), set_visible_focus()
*/
@@ -177,7 +176,6 @@ public:
USERFLAG2 = 1<<30, ///< reserved for 3rd party extensions
USERFLAG1 = 1<<31 ///< reserved for 3rd party extensions
};
-protected:
void draw_box() const;
void draw_box(Fl_Boxtype t, Fl_Color c) const;
void draw_box(Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c) const;
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index e213a8e05..bd4778286 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -2053,7 +2053,7 @@ void Fl_X::make(Fl_Window* w)
x->gc = 0;
NSRect crect;
- if (w->flags() & Fl_Widget::FULLSCREEN) {
+ if (w->fullscreen_active()) {
int sx, sy, sw, sh;
Fl::screen_xywh(sx, sy, sw, sh, w->x(), w->y(), w->w(), w->h());
w->resize(sx, sy, sw, sh);