X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..f925f24de8a4e6aa116efed61ab77ec08b686c67:/include/wx/bitmap.h diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index c65f419f7e..d05b3949db 100644 --- 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"