X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..db7035e48a4ccc6265fa01949cb92db3c6b6c17f:/include/wx/bitmap.h diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index afafd31958..bd81349e36 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -20,12 +20,12 @@ #include "wx/gdicmn.h" // for wxBitmapType #include "wx/colour.h" -class WXDLLEXPORT wxBitmap; -class WXDLLEXPORT wxBitmapHandler; -class WXDLLEXPORT wxIcon; -class WXDLLEXPORT wxImage; -class WXDLLEXPORT wxMask; -class WXDLLEXPORT wxPalette; +class WXDLLIMPEXP_FWD_CORE wxBitmap; +class WXDLLIMPEXP_FWD_CORE wxBitmapHandler; +class WXDLLIMPEXP_FWD_CORE wxIcon; +class WXDLLIMPEXP_FWD_CORE wxImage; +class WXDLLIMPEXP_FWD_CORE wxMask; +class WXDLLIMPEXP_FWD_CORE wxPalette; // ---------------------------------------------------------------------------- // wxVariant support @@ -127,22 +127,19 @@ public: wxBitmap(const char* const* bits); wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM); wxBitmap(const wxImage& image, int depth = -1); - bool operator == (const wxBitmap& bmp) const; - bool operator != (const wxBitmap& bmp) const; bool Create(int width, int height, int depth = -1); static void InitStandardHandlers(); */ - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const = 0; - virtual int GetHeight() const = 0; virtual int GetWidth() const = 0; virtual int GetDepth() const = 0; +#if wxUSE_IMAGE virtual wxImage ConvertToImage() const = 0; +#endif // wxUSE_IMAGE virtual wxMask *GetMask() const = 0; virtual void SetMask(wxMask *mask) = 0;