tell user to define _USE_OLD_RW_STL for BC5.6 instead of refusing to compile with...

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

diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h
index 478e2271b878f5f3e42b2199cfa5286b73810623..be697125ded043100472f78af160d481bea2c239 100644 (file)
--- a/include/wx/cocoa/icon.h
+++ b/include/wx/cocoa/icon.h
@@ -23,8 +23,7 @@ class WXDLLEXPORT wxIcon : public wxGDIObject
 public:
     wxIcon();
 
 public:
     wxIcon();
 

-    wxIcon(const char **data) { CreateFromXpm(data); }
-    wxIcon(char **data) { CreateFromXpm((const char**)data); }
+    wxIcon(const char* const* data) { CreateFromXpm(data); }

     wxIcon(const char bits[], int width , int height );
     wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE,
         int desiredWidth = -1, int desiredHeight = -1);
     wxIcon(const char bits[], int width , int height );
     wxIcon(const wxString& name, int flags = wxBITMAP_TYPE_ICON_RESOURCE,
         int desiredWidth = -1, int desiredHeight = -1);


@@ -52,7 +51,7 @@ public:
     int GetHeight() const;
 
     WX_NSImage GetNSImage() const;
     int GetHeight() const;
 
     WX_NSImage GetNSImage() const;

-    bool CreateFromXpm(const char **bits);
+    bool CreateFromXpm(const char* const* bits);

 
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;
 
 protected:
     virtual wxGDIRefData *CreateGDIRefData() const;