3 files changed, 4 insertions, 2 deletions
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.H b/src/drivers/X11/Fl_X11_Screen_Driver.H
index b974901c0..cc202e881 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.H
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.H
@@ -44,6 +44,7 @@ protected:
   float dpi[MAX_SCREENS][2];
 
 public:
+  static int ewmh_supported();
   // --- display management
   virtual void display(const char *disp);
   virtual int visual(int flags);
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
index 881cdcf57..be26205e7 100644
--- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx
@@ -474,7 +474,7 @@ void Fl_X11_Screen_Driver::grab(Fl_Window* win)
   } else {
     if (Fl::grab()) {
       // We must keep the grab in the non-EWMH fullscreen case
-      if (!fullscreen_win || Fl_X::ewmh_supported()) {
+      if (!fullscreen_win || ewmh_supported()) {
         XUngrabKeyboard(fl_display, fl_event_time);
       }
       XUngrabPointer(fl_display, fl_event_time);
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx
index 7cd0c2823..c6784c9cb 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -19,6 +19,7 @@
 
 #include "../../config_lib.h"
 #include "Fl_X11_Window_Driver.H"
+#include "Fl_X11_Screen_Driver.H"
 #include "../Xlib/Fl_Xlib_Graphics_Driver.H"
 
 #include <FL/Fl_Shared_Image.H>
@@ -187,7 +188,7 @@ int Fl_X11_Window_Driver::decorated_w()
 void Fl_X11_Window_Driver::take_focus()
 {
   Fl_X *i = Fl_X::i(pWindow);
-  if (!Fl_X::ewmh_supported())
+  if (!Fl_X11_Screen_Driver::ewmh_supported())
     pWindow->show();		// Old WMs, XMapRaised
   else if (i)			// New WMs use the NETWM attribute:
     Fl_X::activate_window(i->xid);