reverted Julian's r44600, it broke help window behavior so that it prevented apps...

[wxWidgets.git] / include / wx / motif / icon.h

diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h
index 0be289275935b142a3a3400b1d4ad754ada67f74..73a295d95df576bd096ac46ec0979f365747bbce 100644 (file)
--- a/include/wx/motif/icon.h
+++ b/include/wx/motif/icon.h
@@ -24,8 +24,10 @@ public:
     wxIcon(const char bits[], int width, int height);
 
     // Initialize with XPM data
-    wxIcon(const char **data);
+    wxIcon(const char* const* data);
+#ifdef wxNEEDS_CHARPP
     wxIcon(char **data);
+#endif
 
     wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM,
            int desiredWidth = -1, int desiredHeight = -1)