X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3b9f782ef3949f583e8ac53795d36787f044fc3..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/gtk1/bitmap.h diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 769083eee3..6eb72a95c5 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -2,7 +2,6 @@ // Name: wx/gtk1/bitmap.h // Purpose: // Author: Robert Roebling -// RCS-ID: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -64,8 +63,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 +79,11 @@ 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); } + bool Create(int width, int height, const wxDC& WXUNUSED(dc)) + { return Create(width,height); } virtual int GetHeight() const; virtual int GetWidth() const; @@ -102,7 +106,7 @@ public: #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();