mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed access of protected member (STR #2903)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9750 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Albrecht Schlosser 2012-12-12 17:27:23 +00:00
parent 466cf80f6f
commit da9c3af38a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -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)

6
src/Fl_x.cxx
View File

@ -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);
}