fixed wxUniv/GTK linking by getting rid of GENERICOBJS and putting them into GUIOBJS...

[wxWidgets.git] / src / mac / icon.cpp

diff --git a/src/mac/icon.cpp b/src/mac/icon.cpp
index 7bfb1d8309ea4b78af32a894770552e982546fd3..0133e455347707e03048dcc5387f494ed4f797fd 100644 (file)
--- 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;
 
 
   m_refData = new wxBitmapRefData;
 

-  wxBitmapHandler *handler = FindHandler(type);
+  wxBitmapHandler *handler = FindHandler((wxBitmapType)type);

 
   if ( handler )
        return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);
 
   if ( handler )
        return handler->LoadFile(this, filename, type, desiredWidth, desiredHeight);


@@ -69,6 +69,12 @@ bool wxIcon::LoadFile(const wxString& filename, long type,
        return FALSE;
 }
 
        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,
 IMPLEMENT_DYNAMIC_CLASS(wxICONResourceHandler, wxBitmapHandler)
 
 bool  wxICONResourceHandler::LoadFile(wxBitmap *bitmap, const wxString& name, long flags,