summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlbrecht Schlosser <albrechts.fltk@online.de>2016-04-13 13:21:27 +0000
committerAlbrecht Schlosser <albrechts.fltk@online.de>2016-04-13 13:21:27 +0000
commita1ffa85a1ee978c2ee75526c68a16a4bfec6dab5 (patch)
tree18b2a19e4b160714102592c0001950cf8db39375 /src
parent737ae063816c9c5a554653f8ad9474e706b0f221 (diff)
Remove redundant if condition, fix indenting.
Note: if (i && i->x); should have been: if (i && i->xid); [1] but this is redundant because we always have an xid when an Fl_X exists, at least in X11 (see Fl_X::set_xid(..) in src/Fl_x.cxx). This might change in the future. [1] Clang warning: address of function 'i->x' will always evaluate to 'true'. A similar warning was issued when using gcc 4.9.3 under Cygwin/X11. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11598 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
-rw-r--r--src/drivers/X11/Fl_X11_Window_Driver.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.cxx b/src/drivers/X11/Fl_X11_Window_Driver.cxx
index 538a728a6..7cd0c2823 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.cxx
+++ b/src/drivers/X11/Fl_X11_Window_Driver.cxx
@@ -188,9 +188,9 @@ void Fl_X11_Window_Driver::take_focus()
{
Fl_X *i = Fl_X::i(pWindow);
if (!Fl_X::ewmh_supported())
- pWindow->show(); // Old WMs, XMapRaised
- else if (i && i->x) // New WMs use the NETWM attribute:
- Fl_X::activate_window(i->xid);
+ pWindow->show(); // Old WMs, XMapRaised
+ else if (i) // New WMs use the NETWM attribute:
+ Fl_X::activate_window(i->xid);
}