From 91885f468ae257fd295ae46750e91719646fa381 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 28 Sep 2006 17:11:02 +0000
Subject: [PATCH] no real changes, just replaced a long preprocessor expression
occuring in 2 places with a simple wxUSE_BITMAP_BASE
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/bitmap.h | 34 ++++++++++++++++++++--------------
src/common/bmpbase.cpp | 14 +++++++-------
2 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index 7d688bc788..a4c5d1b1d4 100644
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -35,8 +35,14 @@ class WXDLLEXPORT wxPalette;
defined(__WXCOCOA__) || \
defined(__WXMOTIF__) || \
defined(__WXX11__)
+ #define wxUSE_BITMAP_BASE 1
+#else
+ #define wxUSE_BITMAP_BASE 0
+#endif
+
// Only used by some ports
// FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes
+#if wxUSE_BITMAP_BASE
// ----------------------------------------------------------------------------
// wxBitmapHandler: class which knows how to create/load/save bitmaps in
@@ -155,31 +161,31 @@ protected:
DECLARE_ABSTRACT_CLASS(wxBitmapBase)
};
-#endif
+
+#endif // wxUSE_BITMAP_BASE
#if defined(__WXPALMOS__)
-#include "wx/palmos/bitmap.h"
+ #include "wx/palmos/bitmap.h"
#elif defined(__WXMSW__)
-#include "wx/msw/bitmap.h"
+ #include "wx/msw/bitmap.h"
#elif defined(__WXMOTIF__)
-#include "wx/x11/bitmap.h"
+ #include "wx/x11/bitmap.h"
#elif defined(__WXGTK20__)
-#include "wx/gtk/bitmap.h"
+ #include "wx/gtk/bitmap.h"
#elif defined(__WXGTK__)
-#include "wx/gtk1/bitmap.h"
+ #include "wx/gtk1/bitmap.h"
#elif defined(__WXX11__)
-#include "wx/x11/bitmap.h"
+ #include "wx/x11/bitmap.h"
#elif defined(__WXMGL__)
-#include "wx/mgl/bitmap.h"
+ #include "wx/mgl/bitmap.h"
#elif defined(__WXDFB__)
-#include "wx/dfb/bitmap.h"
+ #include "wx/dfb/bitmap.h"
#elif defined(__WXMAC__)
-#include "wx/mac/bitmap.h"
+ #include "wx/mac/bitmap.h"
#elif defined(__WXCOCOA__)
-#include "wx/cocoa/bitmap.h"
+ #include "wx/cocoa/bitmap.h"
#elif defined(__WXPM__)
-#include "wx/os2/bitmap.h"
+ #include "wx/os2/bitmap.h"
#endif
-#endif
- // _WX_BITMAP_H_BASE_
+#endif // _WX_BITMAP_H_BASE_
diff --git a/src/common/bmpbase.cpp b/src/common/bmpbase.cpp
index 61a7762f7a..bf581183f0 100644
--- a/src/common/bmpbase.cpp
+++ b/src/common/bmpbase.cpp
@@ -15,12 +15,11 @@
#pragma hdrstop
#endif
-#if defined(__WXMGL__) || \
- defined(__WXDFB__) || \
- defined(__WXMAC__) || \
- defined(__WXGTK__) || \
- defined(__WXMOTIF__) || \
- defined(__WXX11__)
+// ----------------------------------------------------------------------------
+// wxBitmapBase
+// ----------------------------------------------------------------------------
+
+#if wxUSE_BITMAP_BASE
#include "wx/bitmap.h"
@@ -124,4 +123,5 @@ public:
IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
-#endif // __WXMGL__ || __WXMAC__ || __WXCOCOA__ || __WXMOTIF__ || __WXX11__
+#endif // wxUSE_BITMAP_BASE
+
--
2.47.2