Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplified #ifs around the code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41509 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-09-29 12:51:10 +00:00
parent 4f2097b6ef
commit e76372220e
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/univ/themes/gtk.cpp
View File

@@ -24,7 +24,9 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_ALL_THEMES || wxUSE_THEME_GTK #include "wx/univ/theme.h"
#if wxUSE_THEME_GTK
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/intl.h" #include "wx/intl.h"
@@ -62,7 +64,6 @@
#include "wx/univ/inpcons.h" #include "wx/univ/inpcons.h"
#include "wx/univ/inphand.h" #include "wx/univ/inphand.h"
#include "wx/univ/colschem.h" #include "wx/univ/colschem.h"
#include "wx/univ/theme.h"
class WXDLLEXPORT wxGTKMenuGeometryInfo; class WXDLLEXPORT wxGTKMenuGeometryInfo;
@@ -2774,4 +2775,4 @@ bool wxGTKTextCtrlInputHandler::HandleKey(wxInputConsumer *control,
#endif // wxUSE_TEXTCTRL #endif // wxUSE_TEXTCTRL
#endif // wxUSE_ALL_THEMES || wxUSE_THEME_GTK #endif // wxUSE_THEME_GTK

7
src/univ/themes/metal.cpp
View File

@@ -24,7 +24,9 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_ALL_THEMES || wxUSE_THEME_METAL #include "wx/univ/theme.h"
#if wxUSE_THEME_METAL
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/timer.h" #include "wx/timer.h"
@@ -57,7 +59,6 @@
#include "wx/univ/inpcons.h" #include "wx/univ/inpcons.h"
#include "wx/univ/inphand.h" #include "wx/univ/inphand.h"
#include "wx/univ/colschem.h" #include "wx/univ/colschem.h"
#include "wx/univ/theme.h"
// wxMetalRenderer: draw the GUI elements in Metal style // 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

7
src/univ/themes/mono.cpp
View File

@@ -24,7 +24,9 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_ALL_THEMES || wxUSE_THEME_MONO #include "wx/univ/theme.h"
#if wxUSE_THEME_MONO
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/dc.h" #include "wx/dc.h"
@@ -34,7 +36,6 @@
#include "wx/univ/stdrend.h" #include "wx/univ/stdrend.h"
#include "wx/univ/inphand.h" #include "wx/univ/inphand.h"
#include "wx/univ/colschem.h" #include "wx/univ/colschem.h"
#include "wx/univ/theme.h"
class wxMonoColourScheme; class wxMonoColourScheme;
@@ -1074,4 +1075,4 @@ wxBitmap wxMonoArtProvider::CreateBitmap(const wxArtID& WXUNUSED(id),
return wxNullBitmap; return wxNullBitmap;
} }
#endif // wxUSE_ALL_THEMES || wxUSE_THEME_MONO #endif // wxUSE_THEME_MONO

7
src/univ/themes/win32.cpp
View File

@@ -24,7 +24,9 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if wxUSE_ALL_THEMES || wxUSE_THEME_WIN32 #include "wx/univ/theme.h"
#if wxUSE_THEME_WIN32
#ifndef WX_PRECOMP #ifndef WX_PRECOMP
#include "wx/timer.h" #include "wx/timer.h"
@@ -67,7 +69,6 @@
#include "wx/univ/inpcons.h" #include "wx/univ/inpcons.h"
#include "wx/univ/inphand.h" #include "wx/univ/inphand.h"
#include "wx/univ/colschem.h" #include "wx/univ/colschem.h"
#include "wx/univ/theme.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// constants // constants
@@ -3775,4 +3776,4 @@ bool wxWin32FrameInputHandler::HandleActivation(wxInputConsumer *consumer,
return wxStdInputHandler::HandleActivation(consumer, activated); return wxStdInputHandler::HandleActivation(consumer, activated);
} }
#endif // wxUSE_ALL_THEMES || wxUSE_THEME_WIN32 #endif // wxUSE_THEME_WIN32