X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/452418c4b0763eb611432e84f077c9766e282057..a3ab1c18017bb08329e73918f9f502ea00cdb447:/include/wx/x11/bitmap.h diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index 9f104b2b00..5a3ab7be0b 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -74,12 +74,18 @@ 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 + // needed for old GCC + wxBitmap(char** data) + { + *this = wxBitmap(wx_const_cast(const char* const*, data)); + } +#endif 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; + bool Ok() const { return IsOk(); } + bool IsOk() const; static void InitStandardHandlers();