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
This commit is contained in:
parent
6d8ca8eeb6
commit
4d52fc463f
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user