Author: AlbrechtS
Date: 2012-12-13 01:10:18 -0800 (Thu, 13 Dec 2012)
New Revision: 9751
Log:
Fixed access of protected member (STR #2903)
Modified:
branches/branch-3.0/src/fltk3/Window_fullscreen.cxx
branches/branch-3.0/src/fltk3/x11.cxx
Modified: branches/branch-3.0/src/fltk3/Window_fullscreen.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/Window_fullscreen.cxx 2012-12-12 17:27:23 UTC
(rev 9750)
+++ branches/branch-3.0/src/fltk3/Window_fullscreen.cxx 2012-12-13 09:10:18 UTC
(rev 9751)
@@ -3,7 +3,7 @@
//
// Fullscreen window support for the Fast Light Tool Kit (FLTK).
//
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2012 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
@@ -72,7 +72,7 @@
no_fullscreen_y = y();
no_fullscreen_w = w();
no_fullscreen_h = h();
- if (shown() && !(flags() & fltk3::Widget::FULLSCREEN)) {
+ if (shown() && !fullscreen_active()) {
fullscreen_x();
} else {
set_flag(FULLSCREEN);
@@ -80,7 +80,7 @@
}
void fltk3::Window::fullscreen_off(int X,int Y,int W,int H) {
- if (shown() && (flags() & fltk3::Widget::FULLSCREEN)) {
+ if (shown() && fullscreen_active()) {
fullscreen_off_x(X, Y, W, H);
} else {
clear_flag(FULLSCREEN);
Modified: branches/branch-3.0/src/fltk3/x11.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/x11.cxx 2012-12-12 17:27:23 UTC (rev
9750)
+++ branches/branch-3.0/src/fltk3/x11.cxx 2012-12-13 09:10:18 UTC (rev
9751)
@@ -1885,7 +1885,7 @@
// 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() & fltk3::Widget::FULLSCREEN && !Fl_X::ewmh_supported()) {
+ if (win->fullscreen_active() && !Fl_X::ewmh_supported()) {
attr.override_redirect = 1;
mask |= CWOverrideRedirect;
fltk3::screen_xywh(X, Y, W, H, X, Y, W, H);
@@ -1952,7 +1952,7 @@
}
// If asked for, create fullscreen
- if (win->flags() & fltk3::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);
}
@@ -1995,7 +1995,7 @@
win->redraw();
}
// non-EWMH fullscreen case, need grab
- if (win->flags() & fltk3::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);
}
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
