X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee437b7e1d7111514b40b3588ad8f2a8d8b45f78..ddadf560da7ec1d7477a40ed5b9277b6468dc5e7:/include/wx/mgl/bitmap.h?ds=sidebyside diff --git a/include/wx/mgl/bitmap.h b/include/wx/mgl/bitmap.h index 9e8409a815..f6392e5f8c 100644 --- a/include/wx/mgl/bitmap.h +++ b/include/wx/mgl/bitmap.h @@ -27,14 +27,19 @@ 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* const* bits); - wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_RESOURCE); + wxBitmap(const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); wxBitmap(const wxImage& image, int depth = -1); virtual ~wxBitmap() {} - 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; @@ -47,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);