X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..594f0f5bf1355fb8d58f403d3ebacc1c1767c429:/include/wx/bitmap.h diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index c65f419f7e..aa86bc86b9 100644 --- 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" @@ -159,8 +161,6 @@ protected: #include "wx/gtk/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__)