use wxImage to load icons in non-native formats

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39551 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 67f83d31f60f8186092138cca565b57807fb45b6..ebf8f49d986406df0624544bf5c33defb8b710cb 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -144,8 +144,14 @@ bool wxIcon::LoadFile(const wxString& filename,
 
     if ( !handler )
     {
-        // say something?
-        return false;
+        // load via wxBitmap which, in turn, uses wxImage allowing us to
+        // support more formats
+        wxBitmap bmp;
+        if ( !bmp.LoadFile(filename, type) )
+            return false;
+
+        CopyFromBitmap(bmp);
+        return true;
     }
 
     return handler->Load(this, filename, type, desiredWidth, desiredHeight);