Better support for unspecified property value in wxDateProperty and DatePickerCtrl...

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

diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h
index 633f2157cd6380189de4f2414f253b5d8ae9c988..5ae629f1cde09d01381bd28fd0a52acbb0627a07 100644 (file)
--- a/include/wx/gtk1/bitmap.h
+++ b/include/wx/gtk1/bitmap.h
@@ -72,10 +72,10 @@ 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
     }
 #endif

-    wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_TYPE_XPM );
+    wxBitmap( const wxString &filename, wxBitmapType type = wxBITMAP_DEFAULT_TYPE );

     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
     virtual ~wxBitmap();
 
     wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); }
     virtual ~wxBitmap();
 


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

 
 #if wxUSE_PALETTE
     wxPalette *GetPalette() const;
 
 #if wxUSE_PALETTE
     wxPalette *GetPalette() const;