X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..43c42c18d36c703a88b1b7b697bac27fe5608eca:/include/wx/gtk1/bitmap.h diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 5ae629f1cd..444b5ab700 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -64,8 +64,9 @@ private: class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: - wxBitmap(); - wxBitmap( int width, int height, int depth = -1 ); + wxBitmap() {} + 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 ); #ifdef wxNEEDS_CHARPP @@ -79,7 +80,9 @@ public: wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } 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; @@ -96,13 +99,13 @@ 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 wxPalette *GetPalette() const; void SetPalette(const wxPalette& palette); - wxPalette *GetColourMap() const { return GetPalette(); }; + wxPalette *GetColourMap() const { return GetPalette(); } #endif // wxUSE_PALETTE static void InitStandardHandlers();