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

8
include/wx/os2/icon.h
View File

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