fix incorrect tests of wxUSE_ macros

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70843 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/generic/tipwin.cpp b/src/generic/tipwin.cpp
index dfc01cff0d88fbf290807951018c188592f49e75..b50fb47a9647790dc36e8a521bb159da1e5943fc 100644 (file)
--- a/src/generic/tipwin.cpp
+++ b/src/generic/tipwin.cpp
@@ -167,7 +167,7 @@ wxTipWindow::~wxTipWindow()
     {
         *m_windowPtr = NULL;
     }
-    #ifdef wxUSE_POPUPWIN
+    #if wxUSE_POPUPWIN
         #ifdef __WXGTK__
             if ( m_view->HasCapture() )
                 m_view->ReleaseMouse();

diff --git a/src/osx/cocoa/window.mm b/src/osx/cocoa/window.mm
index a70459f79b2393f36a891051cd9757976b1a1206..fd719046798481b46cab114447bf961b219341ad 100644 (file)
--- a/src/osx/cocoa/window.mm
+++ b/src/osx/cocoa/window.mm
@@ -931,7 +931,7 @@ void wxOSX_drawRect(NSView* self, SEL _cmd, NSRect rect)
     if (impl == NULL)
         return;
 
-#ifdef wxUSE_THREADS
+#if wxUSE_THREADS
     // OS X starts a NSUIHeartBeatThread for animating the default button in a
     // dialog. This causes a drawRect of the active dialog from outside the
     // main UI thread. This causes an occasional crash since the wx drawing

diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index 102560c637e410f3c1f5c5925e904041aa465a4a..40083c9747284dc11859d9bad6d46b0e55fd383c 100644 (file)
--- a/src/univ/themes/gtk.cpp
+++ b/src/univ/themes/gtk.cpp
@@ -57,9 +57,7 @@
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
 #include "wx/artprov.h"
-#ifdef wxUSE_TOGGLEBTN
 #include "wx/tglbtn.h"
-#endif // wxUSE_TOGGLEBTN
 
 #include "wx/univ/stdrend.h"
 #include "wx/univ/inpcons.h"

diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index 8570049b19d60397365b2a0b92511729cdf062c2..46da9be08fdb8c406de6eb37efd6824f467ee883 100644 (file)
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -61,9 +61,7 @@
 #include "wx/notebook.h"
 #include "wx/spinbutt.h"
 #include "wx/artprov.h"
-#ifdef wxUSE_TOGGLEBTN
 #include "wx/tglbtn.h"
-#endif // wxUSE_TOGGLEBTN
 
 #include "wx/univ/scrtimer.h"
 #include "wx/univ/stdrend.h"