X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5852a1dcbbadb7fd0d5a9d7851aaa67f2370f3cf..86ac84b8ce086e6bbda58f422d41f84268606e35:/include/wx/gtk/bitmap.h diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 0469a707f0..96f3e23814 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -51,13 +51,16 @@ class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap() { } - wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH ); + wxBitmap( int width, int height, int depth = wxBITMAP_SCREEN_DEPTH ) + { Create(width, height, depth); } + wxBitmap( const wxSize& sz, int depth = wxBITMAP_SCREEN_DEPTH ) + { Create(sz, depth); } wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char* const* bits ); #ifdef wxNEEDS_CHARPP // needed for old GCC wxBitmap(char** data) - { *this = wxBitmap(const_cast(data)); } + { *this = wxBitmap(const_cast(data)); } #endif wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); #if wxUSE_IMAGE @@ -67,6 +70,8 @@ public: virtual ~wxBitmap(); 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; @@ -85,7 +90,7 @@ public: wxBitmap GetSubBitmap( const wxRect& rect ) const; bool SaveFile(const wxString &name, wxBitmapType type, - const wxPalette *palette = (wxPalette *)NULL) const; + const wxPalette *palette = NULL) const; bool LoadFile(const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE); #if wxUSE_PALETTE