X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d166a4f8e85f088ac3f602b10520e5393febc481..cff4a45c15d850099265a40d267157cf153e3546:/include/wx/motif/bitmap.h

diff --git a/include/wx/motif/bitmap.h b/include/wx/motif/bitmap.h
index 76f3912dd2..49495e6563 100644
--- a/include/wx/motif/bitmap.h
+++ b/include/wx/motif/bitmap.h
@@ -140,8 +140,12 @@ public:
   // Initialize with raw XBM data
   wxBitmap(const char bits[], int width, int height, int depth = 1);
 
-  // Initialize with XPM data
-  wxBitmap(char **data, wxControl* control = NULL);
+  // from XPM
+  wxBitmap(const char **data) { (void)CreateFromXpm(data); }
+  wxBitmap(char **data) { (void)CreateFromXpm((const char **)data); }
+
+  // Initialize with XPM data -- deprecated
+  wxBitmap(char **data, wxControl* control);
 
   // Load a file or resource
   wxBitmap(const wxString& name, long type = wxBITMAP_TYPE_XPM);
@@ -201,6 +205,9 @@ public:
 
 protected:
   static wxList sm_handlers;
+
+protected:
+    bool CreateFromXpm(const char **bits);
 };
 
 // Creates a bitmap with transparent areas drawn in