From 4d52fc463f9a45b8b784ddaeb1284c0cdccf55cd Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sat, 26 Mar 2016 22:22:46 +0000
Subject: Replace the last bit of platform-dependent code in src/Fl.cxx by
 equivalent code.

The replacement code does the same thing because driver is never NULL
and the ewmh_supported() test is made inside Fl_X11_Window_Driver::take_focus().

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11437 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl.cxx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/Fl.cxx')

diff --git a/src/Fl.cxx b/src/Fl.cxx
index a3f2d2be8..742129fc4 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -866,13 +866,7 @@ void Fl::focus(Fl_Widget *o) {
       while (w1) { win=w1; w1=win->window(); }
       if (win) {
         if (fl_xfocus != win) {
-          Fl_Window_Driver *drvr = win->driver();
-#ifdef USE_X11 // platform fix
-          if (!Fl_X::ewmh_supported()) win->show(); // Old WMs, XMapRaised
-          else if (drvr) drvr->take_focus();
-#else
-          if (drvr) drvr->take_focus();
-#endif
+          win->driver()->take_focus();
           fl_xfocus = win;
         }
       }
-- 
cgit v1.2.3