1. corrected some owner-drawn buttons bugs

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 8449a01cdb8467d1d68cecba4bb28bd254e9a7a6..2917413d439611dfeefd36358faeb0973e9037c7 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -64,8 +64,8 @@ public:
     wxBitmap();
     wxBitmap( int width, int height, int depth = -1 );
     wxBitmap( const char bits[], int width, int height, int depth = 1 );
-    wxBitmap( const char **bits );
-    wxBitmap( char **bits );
+    wxBitmap( const char **bits ) { (void)CreateFromXpm(bits); }
+    wxBitmap( char **bits ) { (void)CreateFromXpm((const char **)bits); }
     wxBitmap( const wxBitmap& bmp );
     wxBitmap( const wxString &filename, int type = wxBITMAP_TYPE_XPM );
     ~wxBitmap();
@@ -99,6 +99,9 @@ public:
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
     
+protected:
+    bool CreateFromXpm(const char **bits);
+
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };