Author: matt
Date: 2012-04-23 13:12:06 -0700 (Mon, 23 Apr 2012)
New Revision: 9388
Log:
Reverted flags in Fl_Widget to protected.
Modified:
branches/branch-1.3/FL/Fl_Widget.H
branches/branch-1.3/src/Fl_cocoa.mm
Modified: branches/branch-1.3/FL/Fl_Widget.H
===================================================================
--- branches/branch-1.3/FL/Fl_Widget.H 2012-04-23 19:33:04 UTC (rev 9387)
+++ branches/branch-1.3/FL/Fl_Widget.H 2012-04-23 20:12:06 UTC (rev 9388)
@@ -148,7 +148,6 @@
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 @@
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;
Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm 2012-04-23 19:33:04 UTC (rev 9387)
+++ branches/branch-1.3/src/Fl_cocoa.mm 2012-04-23 20:12:06 UTC (rev 9388)
@@ -2053,7 +2053,7 @@
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);
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
