X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87f83ac8676d83b1bc75cbb0a6b4cf612f86bc2b..e7b8af652fe667c61d89dfb342c7660b2b16daea:/include/wx/mgl/bitmap.h?ds=inline diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h index 320be07e03..f6392e5f8c 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,30 +23,23 @@ struct bitmap_t; // wxBitmap //----------------------------------------------------------------------------- -class WXDLLEXPORT wxBitmapHandler : public wxBitmapHandlerBase -{ -public: - wxBitmapHandler() : wxBitmapHandlerBase() {} -private: - DECLARE_DYNAMIC_CLASS(wxBitmapHandler) -}; - -class WXDLLEXPORT wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap() {} - wxBitmap(int width, int height, int depth = -1); + wxBitmap(int width, int height, int depth = -1) + { Create(width, height, depth); } + wxBitmap(const wxSize& sz, int depth = -1) + { Create(sz, depth); } wxBitmap(const char bits[], int width, int height, int depth = 1); - wxBitmap(const char **bits) { CreateFromXpm(bits); } - wxBitmap(char **bits) { CreateFromXpm((const char **)bits); } - wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE); + wxBitmap(const char* const* bits); + wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); wxBitmap(const wxImage& image, int depth = -1); virtual ~wxBitmap() {} - bool operator == (const wxBitmap& bmp) const; - bool operator != (const wxBitmap& bmp) const; - bool Ok() const; - bool Create(int width, int height, int depth = -1); + bool Create(int width, int height, int depth = wxBITMAP_SCREEN_DEPTH); + bool Create(const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH) + { return Create(sz.GetWidth(), sz.GetHeight(), depth); } virtual int GetHeight() const; virtual int GetWidth() const; @@ -59,8 +52,8 @@ public: virtual wxBitmap GetSubBitmap(const wxRect& rect) const; - virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL) const; - virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_TYPE_RESOURCE); + virtual bool SaveFile(const wxString &name, wxBitmapType type, const wxPalette *palette = NULL) const; + virtual bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); virtual wxPalette *GetPalette() const; virtual void SetPalette(const wxPalette& palette); @@ -81,7 +74,8 @@ public: bitmap_t *GetMGLbitmap_t() const; protected: - bool CreateFromXpm(const char **bits); + virtual wxGDIRefData *CreateGDIRefData() const; + virtual wxGDIRefData *CloneGDIRefData(const wxGDIRefData *data) const; // creates temporary DC for access to bitmap's data: MGLDevCtx *CreateTmpDC() const;