X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ce1efe123a9b5f7dbb5be4aaf3dd0a21b399f38..b92203a8be20debe7615492c26969d17bcd7fa8d:/include/wx/msw/icon.h diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index 4583310223..f9a08a3c91 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -53,16 +53,19 @@ public: // from raw data wxIcon(const char bits[], int width, int height); + // from XPM data -#ifndef __DIGITALMARS__ wxIcon(const char **data) { CreateIconFromXpm(data); } -#endif + wxIcon(char **data) { CreateIconFromXpm((const char **)data); } + // from resource/file wxIcon(const wxString& name, long type = wxBITMAP_TYPE_ICO_RESOURCE, int desiredWidth = -1, int desiredHeight = -1); + wxIcon(const wxIconLocation& loc); + virtual ~wxIcon(); virtual bool LoadFile(const wxString& name,