diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2009-09-27 12:06:35 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2009-09-27 12:06:35 +0000 |
| commit | c26809e0eac281e5ebd914773417c6ae09fbb3f0 (patch) | |
| tree | c5769dd1d3e79205bba4bf197443bf6b9bad7a9b /src/Fl_mac.cxx | |
| parent | a735162e981a57d629dd7fe460328dbc36287996 (diff) | |
Consolidated all possible flag values into a single enum in Fl_Widget (STR #2161)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6905 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_mac.cxx')
| -rw-r--r-- | src/Fl_mac.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index 609caa83c..31491a709 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -2177,7 +2177,7 @@ void Fl_X::make(Fl_Window* w) wp += 2*bx; hp += 2*by+bt; } - if (!(w->flags() & Fl_Window::FL_FORCE_POSITION)) { + if (!(w->flags() & Fl_Widget::FORCE_POSITION)) { // use the Carbon functions below for default window positioning w->x(xyPos+Fl::x()); w->y(xyPos+Fl::y()); @@ -2224,7 +2224,7 @@ void Fl_X::make(Fl_Window* w) SetWindowClass(x->xid, kFloatingWindowClass); SetWindowActivationScope(x->xid, kWindowActivationScopeAll); } - if (!(w->flags() & Fl_Window::FL_FORCE_POSITION)) + if (!(w->flags() & Fl_Widget::FORCE_POSITION)) { WindowRef pw = Fl_X::first ? Fl_X::first->xid : 0 ; if (w->modal()) { @@ -2404,7 +2404,7 @@ void Fl_Window::resize(int X,int Y,int W,int H) { int is_a_resize = (W != w() || H != h()); // printf("Fl_Winodw::resize(X=%d, Y=%d, W=%d, H=%d), is_a_resize=%d, resize_from_system=%p, this=%p\n", // X, Y, W, H, is_a_resize, resize_from_system, this); - if (X != x() || Y != y()) set_flag(FL_FORCE_POSITION); + if (X != x() || Y != y()) set_flag(FORCE_POSITION); else if (!is_a_resize) return; if ( (resize_from_system!=this) && (!parent()) && shown()) { if (is_a_resize) { |