corrected wxGauge to inherit from wxGaugeBase

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

diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h
index c65f419f7eadc732773a986b62e81d7443036f33..d05b3949dba3d2fbfb2ad7801f780149b6c3729d 100644 (file)
--- a/include/wx/bitmap.h
+++ b/include/wx/bitmap.h
@@ -23,14 +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(__WXMSW__)
 
+// Only used by some ports
 // ----------------------------------------------------------------------------
 // wxBitmapHandler: class which knows how to create/load/save bitmaps in
 // different formats
@@ -68,8 +72,6 @@ protected:
     DECLARE_ABSTRACT_CLASS(wxBitmapHandlerBase)
 };
 
-
-
 class WXDLLEXPORT wxBitmapBase : public wxGDIObject
 {
 public:
@@ -148,8 +150,7 @@ protected:
 
     DECLARE_ABSTRACT_CLASS(wxBitmapBase)
 };
-
-
+#endif
 
 #if defined(__WXMSW__)
 #include "wx/msw/bitmap.h"