From e76372220ef34c80cd801eff2e0523c87fb00bdb Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Fri, 29 Sep 2006 12:51:10 +0000
Subject: [PATCH] simplified #ifs around the code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/univ/themes/gtk.cpp   | 7 ++++---
 src/univ/themes/metal.cpp | 7 ++++---
 src/univ/themes/mono.cpp  | 7 ++++---
 src/univ/themes/win32.cpp | 7 ++++---
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/univ/themes/gtk.cpp b/src/univ/themes/gtk.cpp
index 3e011c3a0e..f2ec37267c 100644
--- a/src/univ/themes/gtk.cpp
+++ b/src/univ/themes/gtk.cpp
@@ -24,7 +24,9 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_ALL_THEMES || wxUSE_THEME_GTK
+#include "wx/univ/theme.h"
+
+#if wxUSE_THEME_GTK
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
@@ -62,7 +64,6 @@
 #include "wx/univ/inpcons.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/colschem.h"
-#include "wx/univ/theme.h"
 
 class WXDLLEXPORT wxGTKMenuGeometryInfo;
 
@@ -2774,4 +2775,4 @@ bool wxGTKTextCtrlInputHandler::HandleKey(wxInputConsumer *control,
 
 #endif // wxUSE_TEXTCTRL
 
-#endif // wxUSE_ALL_THEMES || wxUSE_THEME_GTK
+#endif // wxUSE_THEME_GTK
diff --git a/src/univ/themes/metal.cpp b/src/univ/themes/metal.cpp
index 252a6d7bb1..af2b79fd60 100644
--- a/src/univ/themes/metal.cpp
+++ b/src/univ/themes/metal.cpp
@@ -24,7 +24,9 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_ALL_THEMES || wxUSE_THEME_METAL
+#include "wx/univ/theme.h"
+
+#if wxUSE_THEME_METAL
 
 #ifndef WX_PRECOMP
     #include "wx/timer.h"
@@ -57,7 +59,6 @@
 #include "wx/univ/inpcons.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/colschem.h"
-#include "wx/univ/theme.h"
 
 // wxMetalRenderer: draw the GUI elements in Metal style
 // ----------------------------------------------------------------------------
@@ -594,4 +595,4 @@ void wxMetalRenderer::DrawMetal(wxDC &dc, const wxRect &rect )
     }
 }
 
-#endif // wxUSE_ALL_THEMES || wxUSE_THEME_METAL
+#endif // wxUSE_THEME_METAL
diff --git a/src/univ/themes/mono.cpp b/src/univ/themes/mono.cpp
index 1769ce0b26..c769427651 100644
--- a/src/univ/themes/mono.cpp
+++ b/src/univ/themes/mono.cpp
@@ -24,7 +24,9 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_ALL_THEMES || wxUSE_THEME_MONO
+#include "wx/univ/theme.h"
+
+#if wxUSE_THEME_MONO
 
 #ifndef WX_PRECOMP
     #include "wx/dc.h"
@@ -34,7 +36,6 @@
 #include "wx/univ/stdrend.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/colschem.h"
-#include "wx/univ/theme.h"
 
 class wxMonoColourScheme;
 
@@ -1074,4 +1075,4 @@ wxBitmap wxMonoArtProvider::CreateBitmap(const wxArtID& WXUNUSED(id),
     return wxNullBitmap;
 }
 
-#endif // wxUSE_ALL_THEMES || wxUSE_THEME_MONO
+#endif // wxUSE_THEME_MONO
diff --git a/src/univ/themes/win32.cpp b/src/univ/themes/win32.cpp
index a2ce8d2894..1a08bde723 100644
--- a/src/univ/themes/win32.cpp
+++ b/src/univ/themes/win32.cpp
@@ -24,7 +24,9 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_ALL_THEMES || wxUSE_THEME_WIN32
+#include "wx/univ/theme.h"
+
+#if wxUSE_THEME_WIN32
 
 #ifndef WX_PRECOMP
     #include "wx/timer.h"
@@ -67,7 +69,6 @@
 #include "wx/univ/inpcons.h"
 #include "wx/univ/inphand.h"
 #include "wx/univ/colschem.h"
-#include "wx/univ/theme.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -3775,4 +3776,4 @@ bool wxWin32FrameInputHandler::HandleActivation(wxInputConsumer *consumer,
     return wxStdInputHandler::HandleActivation(consumer, activated);
 }
 
-#endif // wxUSE_ALL_THEMES || wxUSE_THEME_WIN32
+#endif // wxUSE_THEME_WIN32
-- 
2.45.2