summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--src/Fl_x.cxx6
2 files changed, 7 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 91e96d27d..fa881f79f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+CHANGES IN FLTK 1.3.3
+
+ - Fixed access of protected member (STR #2903)
+
CHANGES IN FLTK 1.3.2
- Removed unnecessary drawing calls (STR #2898)
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index 6056bf8bc..44380e5a1 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1873,7 +1873,7 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap)
// since we do not want save_under, do not want to turn off the
// border, and cannot grab without an existing window. Besides,
// there is no clear_override().
- if (win->flags() & Fl_Widget::FULLSCREEN && !Fl_X::ewmh_supported()) {
+ if (win->fullscreen_active() && !Fl_X::ewmh_supported()) {
attr.override_redirect = 1;
mask |= CWOverrideRedirect;
Fl::screen_xywh(X, Y, W, H, X, Y, W, H);
@@ -1940,7 +1940,7 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap)
}
// If asked for, create fullscreen
- if (win->flags() & Fl_Widget::FULLSCREEN && Fl_X::ewmh_supported()) {
+ if (win->fullscreen_active() && Fl_X::ewmh_supported()) {
XChangeProperty (fl_display, xp->xid, fl_NET_WM_STATE, XA_ATOM, 32,
PropModeAppend, (unsigned char*) &fl_NET_WM_STATE_FULLSCREEN, 1);
}
@@ -1984,7 +1984,7 @@ void Fl_X::make_xid(Fl_Window* win, XVisualInfo *visual, Colormap colormap)
}
// non-EWMH fullscreen case, need grab
- if (win->flags() & Fl_Widget::FULLSCREEN && !Fl_X::ewmh_supported()) {
+ if (win->fullscreen_active() && !Fl_X::ewmh_supported()) {
XGrabKeyboard(fl_display, xp->xid, 1, GrabModeAsync, GrabModeAsync, fl_event_time);
}