Author: matt
Date: 2012-04-23 13:15:43 -0700 (Mon, 23 Apr 2012)
New Revision: 9389
Log:
Made fltk3::Widget flags protected again.
Modified:
branches/branch-3.0/include/fltk3/Widget.h
branches/branch-3.0/src/fltk3/cocoa.mm
Modified: branches/branch-3.0/include/fltk3/Widget.h
===================================================================
--- branches/branch-3.0/include/fltk3/Widget.h 2012-04-23 20:12:06 UTC (rev
9388)
+++ branches/branch-3.0/include/fltk3/Widget.h 2012-04-23 20:15:43 UTC (rev
9389)
@@ -346,18 +346,6 @@
protected:
- void draw_box() const;
- void draw_box(Boxtype t, Color c) const;
- void draw_box(Boxtype t, int x,int y,int w,int h, Color c) const;
- void draw_backdrop() const;
- /** draws a focus rectangle around the widget */
- void draw_focus() {draw_focus(box(),x(),y(),w(),h());}
- void draw_focus(Boxtype t, int x,int y,int w,int h) const;
- void draw_label() const;
- void draw_label(int, int, int, int) const;
-
- public:
-
/** flags possible values enumeration.
See activate(), output(), visible(), changed(), set_visible_focus()
*/
@@ -384,6 +372,18 @@
USERFLAG1 = 1<<31 ///< reserved for 3rd party extensions
};
+ void draw_box() const;
+ void draw_box(Boxtype t, Color c) const;
+ void draw_box(Boxtype t, int x,int y,int w,int h, Color c) const;
+ void draw_backdrop() const;
+ /** draws a focus rectangle around the widget */
+ void draw_focus() {draw_focus(box(),x(),y(),w(),h());}
+ void draw_focus(Boxtype t, int x,int y,int w,int h) const;
+ void draw_label() const;
+ void draw_label(int, int, int, int) const;
+
+ public:
+
/** Creates a widget at the given position and size.
The fltk3::Widget is a protected constructor, but all derived widgets
have a
Modified: branches/branch-3.0/src/fltk3/cocoa.mm
===================================================================
--- branches/branch-3.0/src/fltk3/cocoa.mm 2012-04-23 20:12:06 UTC (rev
9388)
+++ branches/branch-3.0/src/fltk3/cocoa.mm 2012-04-23 20:15:43 UTC (rev
9389)
@@ -2048,7 +2048,7 @@
x->gc = 0;
NSRect crect;
- if (w->flags() & fltk3::Widget::FULLSCREEN) {
+ if (w->fullscreen_active()) {
int sx, sy, sw, sh;
fltk3::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
