Add wxDataFormat GetMatchingPair() which wxGTK and wxMSW already had under different...

[wxWidgets.git] / include / wx / x11 / bitmap.h

diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h
index b023702059ee5dd45bebdaa4b83f83bd01768801..2a40965b35453915157dc369e2cdc6228dae8b1d 100644 (file)
--- a/include/wx/x11/bitmap.h
+++ b/include/wx/x11/bitmap.h
@@ -73,7 +73,7 @@ public:
     // needed for old GCC
     wxBitmap(char** data)
     {
     // needed for old GCC
     wxBitmap(char** data)
     {

-        *this = wxBitmap(wx_const_cast(const char* const*, data));
+        *this = wxBitmap(const_cast<const char* const*>(data));

     }
 #endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
     }
 #endif
     wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );


@@ -105,7 +105,7 @@ public:
 
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 
 
     wxBitmap GetSubBitmap( const wxRect& rect ) const;
 

-    bool SaveFile( const wxString &name, wxBitmapType type, const wxPalette *palette = (wxPalette *) NULL ) const;
+    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;
     bool LoadFile( const wxString &name, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );
 
     wxPalette *GetPalette() const;