Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-31 22:04:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverted flags in Fl_Widget to protected.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9388 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2012-04-23 20:12:06 +00:00
parent d07ef80207
commit e2d3d400cd
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Widget.H
-2
View File
@@ -148,7 +148,6 @@ protected:
void set_flag(unsigned int c) {flags_ |= c;} void set_flag(unsigned int c) {flags_ |= c;}
/** Clears a flag in the flags mask */ /** Clears a flag in the flags mask */
void clear_flag(unsigned int c) {flags_ &= ~c;} void clear_flag(unsigned int c) {flags_ &= ~c;}
public:
/** flags possible values enumeration. /** flags possible values enumeration.
See activate(), output(), visible(), changed(), set_visible_focus() See activate(), output(), visible(), changed(), set_visible_focus()
*/ */
@@ -177,7 +176,6 @@ public:
USERFLAG2 = 1<<30, ///< reserved for 3rd party extensions USERFLAG2 = 1<<30, ///< reserved for 3rd party extensions
USERFLAG1 = 1<<31 ///< reserved for 3rd party extensions USERFLAG1 = 1<<31 ///< reserved for 3rd party extensions
}; };
protected:
void draw_box() const; void draw_box() const;
void draw_box(Fl_Boxtype t, Fl_Color c) 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; void draw_box(Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c) const;
src/Fl_cocoa.mm
+1 -1
View File
@@ -2053,7 +2053,7 @@ void Fl_X::make(Fl_Window* w)
x->gc = 0; x->gc = 0;
NSRect crect; NSRect crect;
if (w->flags() & Fl_Widget::FULLSCREEN) { if (w->fullscreen_active()) {
int sx, sy, sw, sh; int sx, sy, sw, sh;
Fl::screen_xywh(sx, sy, sw, sh, w->x(), w->y(), w->w(), w->h()); Fl::screen_xywh(sx, sy, sw, sh, w->x(), w->y(), w->w(), w->h());
w->resize(sx, sy, sw, sh); w->resize(sx, sy, sw, sh);