Author: manolo
Date: 2011-11-29 06:41:33 -0800 (Tue, 29 Nov 2011)
New Revision: 9192
Log:
Fix STR #2779: clang-detected error
Modified:
branches/branch-1.3/src/Fl_cocoa.mm
branches/branch-1.3/src/Fl_x.cxx
Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm 2011-11-29 11:50:18 UTC (rev 9191)
+++ branches/branch-1.3/src/Fl_cocoa.mm 2011-11-29 14:41:33 UTC (rev 9192)
@@ -2030,7 +2030,7 @@
wp += 2*bx;
hp += 2*by+bt;
}
- if (w->flags() & Fl_Window::FORCE_POSITION) {
+ if (w->force_position()) {
if (!Fl::grab()) {
xp = xwm; yp = ywm;
w->x(xp);w->y(yp);
@@ -2076,7 +2076,7 @@
[cw setLevel:winlevel];
q_set_window_title(cw, w->label(), w->iconlabel());
- if (!(w->flags() & Fl_Window::FORCE_POSITION)) {
+ if (!w->force_position()) {
if (w->modal()) {
[cw center];
} else if (w->non_modal()) {
Modified: branches/branch-1.3/src/Fl_x.cxx
===================================================================
--- branches/branch-1.3/src/Fl_x.cxx 2011-11-29 11:50:18 UTC (rev 9191)
+++ branches/branch-1.3/src/Fl_x.cxx 2011-11-29 14:41:33 UTC (rev 9192)
@@ -1671,7 +1671,7 @@
if (!win->parent() && !Fl::grab()) {
// center windows in case window manager does not do anything:
#ifdef FL_CENTER_WINDOWS
- if (!(win->flags() & Fl_Widget::FORCE_POSITION)) {
+ if (!win->force_position()) {
win->x(X = scr_x+(scr_w-W)/2);
win->y(Y = scr_y+(scr_h-H)/2);
}
@@ -1885,7 +1885,7 @@
prop[1] = 1|2|16; // MWM_FUNC_ALL | MWM_FUNC_RESIZE | MWM_FUNC_MAXIMIZE
}
- if (w->flags() & Fl_Widget::FORCE_POSITION) {
+ if (w->force_position()) {
hints->flags |= USPosition;
hints->x = w->x();
hints->y = w->y();
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
