X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b7cacb43db1e69b87b257a67912b4d52995b070a..4f2511d706e5274a34e1521e11c1b95fed735b42:/include/wx/mgl/bitmap.h diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h index 25a58396b5..9e8409a815 100644 --- a/include/wx/mgl/bitmap.h +++ b/include/wx/mgl/bitmap.h @@ -13,8 +13,8 @@ // classes //----------------------------------------------------------------------------- -class WXDLLEXPORT wxDC; -class WXDLLEXPORT wxMemoryDC; +class WXDLLIMPEXP_FWD_CORE wxDC; +class WXDLLIMPEXP_FWD_CORE wxMemoryDC; class MGLDevCtx; struct bitmap_t; @@ -23,12 +23,7 @@ struct bitmap_t; // wxBitmap //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase -{ - DECLARE_ABSTRACT_CLASS(wxBitmapHandler) -}; - -class WXDLLEXPORT wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap() {} @@ -38,10 +33,6 @@ public: wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE); wxBitmap(const wxImage& image, int depth = -1); virtual ~wxBitmap() {} - bool operator == (const wxBitmap& bmp) const; - bool operator != (const wxBitmap& bmp) const; - bool Ok() const { return IsOk(); } - bool IsOk() const; bool Create(int width, int height, int depth = -1); @@ -78,6 +69,9 @@ public: bitmap_t *GetMGLbitmap_t() const; protected: + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; + // creates temporary DC for access to bitmap's data: MGLDevCtx *CreateTmpDC() const; // sets fg & bg colours for 1bit bitmaps: