X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ccdb93e4ae4b606a4068cb37492c1ec3ed77a6..c058cafa56179e79df02ad370bdeafd725ff2478:/include/wx/os2/icon.h diff --git a/include/wx/os2/icon.h b/include/wx/os2/icon.h index af4208791d..b86db3388f 100644 --- a/include/wx/os2/icon.h +++ b/include/wx/os2/icon.h @@ -44,8 +44,10 @@ public: ,int nWidth ,int nHeight ); - inline wxIcon(const char** ppData) { CreateIconFromXpm(ppData); } - inline wxIcon(char** ppData) { CreateIconFromXpm((const char**)ppData); } + wxIcon(const char* const* ppData) { CreateIconFromXpm(ppData); } +#ifdef wxNEEDS_CHARPP + wxIcon(char** ppData) { CreateIconFromXpm(wx_const_cast(const char* const*, ppData)); } +#endif wxIcon( const wxString& rName ,long lFlags = wxBITMAP_TYPE_ICO_RESOURCE ,int nDesiredWidth = -1 @@ -77,7 +79,7 @@ protected: { return new wxIconRefData; } - void CreateIconFromXpm(const char **ppData); + void CreateIconFromXpm(const char* const* ppData); private: bool m_bIsXpm;