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

5 files changed, 11 insertions, 11 deletions

diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index 20fcab692..4f54e7ebc 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -66,7 +66,7 @@ Fl_Window::Fl_Window(int X,int Y,int W, int H, const char *l)
   cursor_bg      = FL_WHITE;
 
   _Fl_Window();
-  set_flag(FL_FORCE_POSITION);
+  set_flag(FORCE_POSITION);
 }
 
 Fl_Window::Fl_Window(int W, int H, const char *l)
diff --git a/src/Fl_Window_fullscreen.cxx b/src/Fl_Window_fullscreen.cxx
index c85071308..99af00aa9 100644
--- a/src/Fl_Window_fullscreen.cxx
+++ b/src/Fl_Window_fullscreen.cxx
@@ -43,10 +43,10 @@
 void Fl_Window::border(int b) {
   if (b) {
     if (border()) return;
-    clear_flag(FL_NOBORDER);
+    clear_flag(NOBORDER);
   } else {
     if (!border()) return;
-    set_flag(FL_NOBORDER);
+    set_flag(NOBORDER);
   }
 #if defined(USE_X11)
   if (shown()) Fl_X::i(this)->sendxjunk();
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) {
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index 3251f4529..136b3ee0f 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -1292,7 +1292,7 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
   int resize_from_program = (this != resize_bug_fix);
   if (!resize_from_program) resize_bug_fix = 0;
   if (X != x() || Y != y()) {
-    set_flag(FL_FORCE_POSITION);
+    set_flag(FORCE_POSITION);
   } else {
     if (!is_a_resize) return;
     flags |= SWP_NOMOVE;
@@ -1474,7 +1474,7 @@ Fl_X* 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)) {
       xp = yp = CW_USEDEFAULT;
     } else {
       if (!Fl::grab()) {
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index ab3dce8a9..d57385aed 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1352,7 +1352,7 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
   int is_a_resize = (W != w() || H != h());
   int resize_from_program = (this != resize_bug_fix);
   if (!resize_from_program) resize_bug_fix = 0;
-  if (is_a_move && resize_from_program) set_flag(FL_FORCE_POSITION);
+  if (is_a_move && resize_from_program) set_flag(FORCE_POSITION);
   else if (!is_a_resize && !is_a_move) return;
   if (is_a_resize) {
     Fl_Group::resize(X,Y,W,H);
@@ -1430,7 +1430,7 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap)
   if (!win->parent() && !Fl::grab()) {
     // center windows in case window manager does not do anything:
 #ifdef FL_CENTER_WINDOWS
-    if (!(win->flags() & Fl_Window::FL_FORCE_POSITION)) {
+    if (!(win->flags() & Fl_Widget::FORCE_POSITION)) {
       win->x(X = scr_x+(scr_w-W)/2);
       win->y(Y = scr_y+(scr_h-H)/2);
     }
@@ -1636,7 +1636,7 @@ void Fl_X::sendxjunk() {
     prop[1] = 1|2|16; // MWM_FUNC_ALL | MWM_FUNC_RESIZE | MWM_FUNC_MAXIMIZE
   }
 
-  if (w->flags() & Fl_Window::FL_FORCE_POSITION) {
+  if (w->flags() & Fl_Widget::FORCE_POSITION) {
     hints->flags |= USPosition;
     hints->x = w->x();
     hints->y = w->y();