Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make XPM data pointer parameter fully const

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51211 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2008-01-14 18:16:37 +00:00
parent 872051d89b
commit e45080c10b
17 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/wx/msw/icon.h
View File

@@ -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)