X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..7e08bc5acd8ee4e2f0756f50bf98937a118f9951:/include/wx/x11/bitmap.h?ds=sidebyside diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index 29572c4870..2a40965b35 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -62,11 +62,6 @@ private: // wxBitmap //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase -{ - DECLARE_ABSTRACT_CLASS(wxBitmapHandler) -}; - class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: @@ -78,10 +73,10 @@ public: // needed for old GCC wxBitmap(char** data) { - *this = wxBitmap(wx_const_cast(const char* const*, data)); + *this = wxBitmap(const_cast(data)); } #endif - wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM ); + wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); virtual ~wxBitmap(); static void InitStandardHandlers(); @@ -110,8 +105,8 @@ public: wxBitmap GetSubBitmap( const wxRect& rect ) const; - bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL ) const; - bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_TYPE_XPM ); + bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = NULL ) const; + bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE ); wxPalette *GetPalette() const; wxPalette *GetColourMap() const