- update patch as per the discussion at http://www.fltk.org/str.php?L2903

2 files changed, 30 insertions, 10 deletions

diff --git a/x11-toolkits/fltk/files/patch-FL_Fl_Widget.H b/x11-toolkits/fltk/files/patch-FL_Fl_Widget.H
deleted file mode 100644
index 225614ffe622..000000000000
--- a/x11-toolkits/fltk/files/patch-FL_Fl_Widget.H
+++ /dev/null
@@ -1,10 +0,0 @@
---- FL/Fl_Widget.H.orig	2012-12-12 15:44:54.000000000 +0100
-+++ FL/Fl_Widget.H	2012-12-12 15:52:48.000000000 +0100
-@@ -99,6 +99,7 @@
-  */
- class FL_EXPORT Fl_Widget {
-   friend class Fl_Group;
-+  friend class Fl_X;
- 
-   Fl_Group* parent_;
-   Fl_Callback* callback_;
diff --git a/x11-toolkits/fltk/files/patch-src_Fl_x.cxx b/x11-toolkits/fltk/files/patch-src_Fl_x.cxx
new file mode 100644
index 000000000000..ad5f047b9954
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-src_Fl_x.cxx
@@ -0,0 +1,30 @@
+Index: src/Fl_x.cxx
+===================================================================
+--- src/Fl_x.cxx	(revision 9749)
++++ src/Fl_x.cxx	(working copy)
+@@ -1873,7 +1873,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() & 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 @@
+     }
+ 
+     // 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 @@
+   }
+ 
+   // 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);
+   }