Fixed a void* to wxObject* conversion error in a return causing compile break across...

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

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 37c42b14c539eebf50c011f79edbe06ae89d6d64..2917413d439611dfeefd36358faeb0973e9037c7 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -19,6 +19,7 @@
 #include "wx/object.h"
 #include "wx/string.h"
 #include "wx/palette.h"
+#include "wx/gdiobj.h"
 
 //-----------------------------------------------------------------------------
 // classes
@@ -57,14 +58,14 @@ private:
 // wxBitmap
 //-----------------------------------------------------------------------------
 
-class wxBitmap: public wxObject
+class wxBitmap: public wxGDIObject
 {
 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();
@@ -88,6 +89,7 @@ public:
     { return GetPalette(); };
 
     // implementation
+    // --------------
 
     void SetHeight( int height );
     void SetWidth( int width );
@@ -96,9 +98,10 @@ public:
 
     GdkPixmap *GetPixmap() const;
     GdkBitmap *GetBitmap() const;
-
-    // no data :-)
     
+protected:
+    bool CreateFromXpm(const char **bits);
+
 private:
     DECLARE_DYNAMIC_CLASS(wxBitmap)
 };