X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a4bf7eefbc04cb91652031d9a729720d52dde61..6dc2e8233023023f7e3ced53be717bc61e9888ca:/include/wx/gtk1/bitmap.h diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 18e2f40f19..02d8eeda6b 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -68,7 +68,7 @@ public: wxBitmap( int width, int height, int depth = -1 ); wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char* const* bits ); -#if defined (__GNUC__) && __GNUC__ < 3 +#ifdef wxNEEDS_CHARPP // needed for old GCC wxBitmap(char** data) { @@ -78,8 +78,6 @@ public: wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } virtual ~wxBitmap(); - bool operator == ( const wxBitmap& bmp ) const; - bool operator != ( const wxBitmap& bmp ) const; bool Ok() const { return IsOk(); } bool IsOk() const; @@ -137,6 +135,9 @@ public: protected: bool CreateFromImage(const wxImage& image, int depth); + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + private: // to be called from CreateFromImage only! bool CreateFromImageAsBitmap(const wxImage& image);