X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/524c47aa3adf2af11a3069fd5da035a604f08f66..6ae55c76d85d20be45fad5c243f4bbfb394d4378:/src/osx/carbon/icon.cpp?ds=sidebyside

diff --git a/src/osx/carbon/icon.cpp b/src/osx/carbon/icon.cpp
index 4b0ffbe322..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)
@@ -124,7 +124,7 @@ wxGDIRefData *wxIcon::CreateGDIRefData() const
 
 wxGDIRefData *wxIcon::CloneGDIRefData(const wxGDIRefData *data) const
 {
-    return new wxIconRefData(*wx_static_cast(const wxIconRefData *, data));
+    return new wxIconRefData(*static_cast<const wxIconRefData *>(data));
 }
 
 WXHICON wxIcon::GetHICON() const
@@ -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 ;