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

no real changes, just replaced a long preprocessor expression occuring in 2 places with a simple wxUSE_BITMAP_BASE

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41493 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-09-28 17:11:02 +00:00
parent 8e3e26d375
commit 91885f468a
2 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
include/wx/bitmap.h
View File

@@ -35,8 +35,14 @@ class WXDLLEXPORT wxPalette;
defined(__WXCOCOA__) || \ defined(__WXCOCOA__) || \
defined(__WXMOTIF__) || \ defined(__WXMOTIF__) || \
defined(__WXX11__) defined(__WXX11__)
#define wxUSE_BITMAP_BASE 1
#else
#define wxUSE_BITMAP_BASE 0
#endif
// Only used by some ports // Only used by some ports
// FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes // 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 // wxBitmapHandler: class which knows how to create/load/save bitmaps in
@@ -155,31 +161,31 @@ protected:
DECLARE_ABSTRACT_CLASS(wxBitmapBase) DECLARE_ABSTRACT_CLASS(wxBitmapBase)
}; };
#endif
#endif // wxUSE_BITMAP_BASE
#if defined(__WXPALMOS__) #if defined(__WXPALMOS__)
#include "wx/palmos/bitmap.h" #include "wx/palmos/bitmap.h"
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
#include "wx/msw/bitmap.h" #include "wx/msw/bitmap.h"
#elif defined(__WXMOTIF__) #elif defined(__WXMOTIF__)
#include "wx/x11/bitmap.h" #include "wx/x11/bitmap.h"
#elif defined(__WXGTK20__) #elif defined(__WXGTK20__)
#include "wx/gtk/bitmap.h" #include "wx/gtk/bitmap.h"
#elif defined(__WXGTK__) #elif defined(__WXGTK__)
#include "wx/gtk1/bitmap.h" #include "wx/gtk1/bitmap.h"
#elif defined(__WXX11__) #elif defined(__WXX11__)
#include "wx/x11/bitmap.h" #include "wx/x11/bitmap.h"
#elif defined(__WXMGL__) #elif defined(__WXMGL__)
#include "wx/mgl/bitmap.h" #include "wx/mgl/bitmap.h"
#elif defined(__WXDFB__) #elif defined(__WXDFB__)
#include "wx/dfb/bitmap.h" #include "wx/dfb/bitmap.h"
#elif defined(__WXMAC__) #elif defined(__WXMAC__)
#include "wx/mac/bitmap.h" #include "wx/mac/bitmap.h"
#elif defined(__WXCOCOA__) #elif defined(__WXCOCOA__)
#include "wx/cocoa/bitmap.h" #include "wx/cocoa/bitmap.h"
#elif defined(__WXPM__) #elif defined(__WXPM__)
#include "wx/os2/bitmap.h" #include "wx/os2/bitmap.h"
#endif #endif
#endif #endif // _WX_BITMAP_H_BASE_
// _WX_BITMAP_H_BASE_

14
src/common/bmpbase.cpp
View File

@@ -15,12 +15,11 @@
#pragma hdrstop #pragma hdrstop
#endif #endif
#if defined(__WXMGL__) || \ // ----------------------------------------------------------------------------
defined(__WXDFB__) || \ // wxBitmapBase
defined(__WXMAC__) || \ // ----------------------------------------------------------------------------
defined(__WXGTK__) || \
defined(__WXMOTIF__) || \ #if wxUSE_BITMAP_BASE
defined(__WXX11__)
#include "wx/bitmap.h" #include "wx/bitmap.h"
@@ -124,4 +123,5 @@ public:
IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule) IMPLEMENT_DYNAMIC_CLASS(wxBitmapBaseModule, wxModule)
#endif // __WXMGL__ || __WXMAC__ || __WXCOCOA__ || __WXMOTIF__ || __WXX11__ #endif // wxUSE_BITMAP_BASE