X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3dec57adfdb2469b7679930092f0bd9c8569d62c..d21d2e5adf7a5acf3b496a9c4e87eab220bd75d8:/src/mac/icon.cpp?ds=sidebyside

diff --git a/src/mac/icon.cpp b/src/mac/icon.cpp
index 7bfb1d8309..0133e45534 100644
--- a/src/mac/icon.cpp
+++ b/src/mac/icon.cpp
@@ -61,7 +61,7 @@ bool wxIcon::LoadFile(const wxString& filename, long type,
 
   m_refData = new wxBitmapRefData;
 
-  wxBitmapHandler *handler = FindHandler(type);
+  wxBitmapHandler *handler = FindHandler((wxBitmapType)type);
 
   if ( handler )
 	return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
@@ -69,6 +69,12 @@ bool wxIcon::LoadFile(const wxString& filename, long type,
 	return FALSE;
 }
 
+void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
+{
+    wxIcon *icon = (wxIcon*)(&bmp);
+    *this = *icon;
+}
+
 IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
 
 bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,