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

5
include/wx/cocoa/icon.h
View File

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