X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/53a2db124c633f80bdb16336084262037d879a2c..0ecd03525b34edba886ca83ff724265cd912dbbd:/include/wx/msw/icon.h diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index 46c29a6c3a..21f8abd6b4 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -50,11 +50,11 @@ public: // from XPM data wxIcon(const char* const* data) { CreateIconFromXpm(data); } #ifdef wxNEEDS_CHARPP - wxIcon(char **data) { CreateIconFromXpm(wx_const_cast(const char* const*, data)); } + wxIcon(char **data) { CreateIconFromXpm(const_cast(data)); } #endif // from resource/file wxIcon(const wxString& name, - wxBitmapType type = wxBITMAP_TYPE_ICO_RESOURCE, + wxBitmapType type = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1); wxIcon(const wxIconLocation& loc); @@ -62,7 +62,7 @@ public: virtual ~wxIcon(); virtual bool LoadFile(const wxString& name, - wxBitmapType type = wxBITMAP_TYPE_ICO_RESOURCE, + wxBitmapType type = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1); // implementation only from now on