X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ccdb93e4ae4b606a4068cb37492c1ec3ed77a6..0685aa9eb65aae0c930ef2a001002ac217cf5ce1:/include/wx/msw/icon.h

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index c4b420937c..7984f79d37 100644
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -48,10 +48,10 @@ public:
     wxIcon(const char bits[], int width, int height);
 
         // from XPM data
-    wxIcon(const char **data) { CreateIconFromXpm(data); }
-
-    wxIcon(char **data) { CreateIconFromXpm((const char **)data); }
-
+    wxIcon(const char* const* data) { CreateIconFromXpm(data); }
+#ifdef wxNEEDS_CHARPP
+    wxIcon(char **data) { CreateIconFromXpm(wx_const_cast(const char* const*, data)); }
+#endif
         // from resource/file
     wxIcon(const wxString& name,
            long type = wxBITMAP_TYPE_ICO_RESOURCE,
@@ -85,7 +85,7 @@ protected:
     virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
 
     // create from XPM data
-    void CreateIconFromXpm(const char **data);
+    void CreateIconFromXpm(const char* const* data);
 
 private:
     DECLARE_DYNAMIC_CLASS(wxIcon)