X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..3ed946f2835520aeae67c69582c068bf2e109008:/include/wx/cocoa/icon.h?ds=sidebyside diff --git a/include/wx/cocoa/icon.h b/include/wx/cocoa/icon.h index 478e2271b8..be697125de 100644 --- a/include/wx/cocoa/icon.h +++ b/include/wx/cocoa/icon.h @@ -23,8 +23,7 @@ class WXDLLEXPORT wxIcon : public wxGDIObject 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); @@ -52,7 +51,7 @@ public: int GetHeight() const; WX_NSImage GetNSImage() const; - bool CreateFromXpm(const char **bits); + bool CreateFromXpm(const char* const* bits); protected: virtual wxGDIRefData *CreateGDIRefData() const;