X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/icon.cpp

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 9064101a53..ebf8f49d98 100644
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/icon.cpp
+// Name:        src/msw/icon.cpp
 // Purpose:     wxIcon class
 // Author:      Julian Smart
 // Modified by: 20.11.99 (VZ): don't derive from wxBitmap any more
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "icon.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -29,7 +25,6 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/defs.h"
     #include "wx/list.h"
     #include "wx/utils.h"
     #include "wx/app.h"
@@ -102,6 +97,21 @@ wxIcon::~wxIcon()
 {
 }
 
+wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const
+{
+    const wxIconRefData *
+        data = wx_static_cast(const wxIconRefData *, dataOrig);
+    if ( !data )
+        return NULL;
+
+    // we don't have to copy m_hIcon because we're only called from SetHICON()
+    // which overwrites m_hIcon anyhow currently
+    //
+    // and if we're called from SetWidth/Height/Depth(), it doesn't make sense
+    // to copy it neither as the handle would be inconsistent with the new size
+    return new wxIconRefData(*data);
+}
+
 void wxIcon::CopyFromBitmap(const wxBitmap& bmp)
 {
 #ifndef __WXMICROWIN__
@@ -134,10 +144,15 @@ 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);
 }
-