Remove fudges in Show: 1) Do not force a window to top when it is shown 2) Remove...

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

diff --git a/src/msw/icon.cpp b/src/msw/icon.cpp
index 5cab68a51cfa9d354399a005bc43fdac924e5da9..e0fa3ee5106a639595137bd26d507002a18bd49d 100644 (file)
--- a/src/msw/icon.cpp
+++ b/src/msw/icon.cpp
@@ -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"
 
@@ -109,16 +105,12 @@ wxObjectRefData *wxIcon::CloneRefData(const wxObjectRefData *dataOrig) const
     if ( !data )
         return NULL;
 
-    wxIcon *self = wx_const_cast(wxIcon *, this);
-    lf->UnRef();
-    lf->m_refData = new wxIconRefData(*data);
-
-    if ( data->m_hIcon )
-    {
-        ::CopyIcon(HICON(data->m_hIcon));
-    }
-
-    return m_refData;
+    // 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)