improved conditional compilation test (added wxUSE_POSTSCRIPT)

[wxWidgets.git] / include / wx / bitmap.h

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index c65f419f7eadc732773a986b62e81d7443036f33..478697ae6b835f727d1d7a464b0e7d5e46b11752 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -23,13 +23,18 @@
 #include "wx/defs.h"
 #include "wx/object.h"
 #include "wx/string.h"
-#include "wx/palette.h"
 #include "wx/gdiobj.h"
+#include "wx/gdicmn.h"  // for wxBitmapType
 
-class WXDLLEXPORT wxImage;
-class WXDLLEXPORT wxMask;
 class WXDLLEXPORT wxBitmap;
 class WXDLLEXPORT wxBitmapHandler;
+class WXDLLEXPORT wxImage;
+class WXDLLEXPORT wxMask;
+class WXDLLEXPORT wxPalette;
+
+#if defined(__WXMGL__) || defined(__WXMAC__)
+// Only used by some ports
+// FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes
 
 // ----------------------------------------------------------------------------
 // wxBitmapHandler: class which knows how to create/load/save bitmaps in
@@ -68,8 +73,6 @@ protected:
     DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
 };
 
-
-
 class WXDLLEXPORT wxBitmapBase : public wxGDIObject
 {
 public:
@@ -148,8 +151,7 @@ protected:
 
     DECLARE_ABSTRACT_CLASS(wxBitmapBase)
 };
-
-
+#endif
 
 #if defined(__WXMSW__)
 #include "wx/msw/bitmap.h"
@@ -157,10 +159,10 @@ protected:
 #include "wx/motif/bitmap.h"
 #elif defined(__WXGTK__)
 #include "wx/gtk/bitmap.h"
+#elif defined(__WXX11__)
+#include "wx/x11/bitmap.h"
 #elif defined(__WXMGL__)
 #include "wx/mgl/bitmap.h"
-#elif defined(__WXQT__)
-#include "wx/qt/bitmap.h"
 #elif defined(__WXMAC__)
 #include "wx/mac/bitmap.h"
 #elif defined(__WXPM__)