X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e45080c10b11190028e843b617564caec95e82dd..1afe8c83072c52d957db8a9877ca28011258ecac:/src/msw/icon.cpp diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp index ee899f2b8a..778aace5f3 100644 --- a/src/msw/icon.cpp +++ b/src/msw/icon.cpp @@ -72,12 +72,12 @@ wxIcon::wxIcon(const char bits[], int width, int height) } wxIcon::wxIcon(const wxString& iconfile, - long flags, + wxBitmapType type, int desiredWidth, int desiredHeight) { - LoadFile(iconfile, flags, desiredWidth, desiredHeight); + LoadFile(iconfile, type, desiredWidth, desiredHeight); } wxIcon::wxIcon(const wxIconLocation& loc) @@ -100,7 +100,7 @@ wxIcon::~wxIcon() wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const { const wxIconRefData * - data = wx_static_cast(const wxIconRefData *, dataOrig); + data = static_cast(dataOrig); if ( !data ) return NULL; @@ -135,7 +135,7 @@ void wxIcon::CreateIconFromXpm(const char* const* data) } bool wxIcon::LoadFile(const wxString& filename, - long type, + wxBitmapType type, int desiredWidth, int desiredHeight) { UnRef();