From: Paul Cornett <paulcor@bullseye.com>
Date: Thu, 8 Mar 2012 16:45:17 +0000 (+0000)
Subject: fix incorrect tests of wxUSE_ macros
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/32b183b5785003338bb6247fe41fc66d6243aff2

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 dfc01cff0d..b50fb47a96 100644
--- 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 a70459f79b..fd71904679 100644
--- 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 102560c637..40083c9747 100644
--- 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 8570049b19..46da9be08f 100644
--- 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"