X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4a4bf7eefbc04cb91652031d9a729720d52dde61..8d3223cb32a60bc7fe1d5ab62d682eaa565a50da:/include/wx/x11/bitmap.h?ds=sidebyside diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index 9cf858f893..84e7f3ebc0 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -74,7 +74,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) { @@ -84,8 +84,6 @@ public: wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); virtual ~wxBitmap(); - bool operator == ( const wxBitmap& bmp ) const; - bool operator != ( const wxBitmap& bmp ) const; bool Ok() const { return IsOk(); } bool IsOk() const; @@ -139,9 +137,12 @@ public: WXDisplay *GetDisplay() const; +protected: + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + private: DECLARE_DYNAMIC_CLASS(wxBitmap) }; -#endif -// _WX_BITMAP_H_ +#endif // _WX_BITMAP_H_