don't append anything back in DoDeleteOneItem() if the control becomes empty (fixes...

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 67f83d31f60f8186092138cca565b57807fb45b6..ee899f2b8abcc6a58f9aeaf09629d518553dc959 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -128,7 +128,7 @@ void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 #endif // __WXMICROWIN__
 }
 
-void wxIcon::CreateIconFromXpm(const char **data)
+void wxIcon::CreateIconFromXpm(const char* const* data)
 {
     wxBitmap bmp(data);
     CopyFromBitmap(bmp);
@@ -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);