X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5c33522fca7cddc441a316f5b9fb50d7685435ba..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/osx/carbon/icon.cpp diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp index 5720f1bf81..ddd2dd43dc 100644 --- a/src/osx/carbon/icon.cpp +++ b/src/osx/carbon/icon.cpp @@ -97,10 +97,10 @@ wxIcon::wxIcon(const char* const* bits) } wxIcon::wxIcon( - const wxString& icon_file, int flags, + const wxString& icon_file, wxBitmapType flags, int desiredWidth, int desiredHeight ) { - LoadFile( icon_file, (wxBitmapType) flags, desiredWidth, desiredHeight ); + LoadFile( icon_file, flags, desiredWidth, desiredHeight ); } wxIcon::wxIcon(WXHICON icon, const wxSize& size) @@ -305,7 +305,7 @@ void wxIcon::CopyFromBitmap( const wxBitmap& bmp ) IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler) bool wxICONResourceHandler::LoadFile( - wxBitmap *bitmap, const wxString& name, long WXUNUSED(flags), + wxBitmap *bitmap, const wxString& name, wxBitmapType WXUNUSED(flags), int desiredWidth, int desiredHeight ) { wxIcon icon ;