implemented wxDC::DoGetSize() correctly for metafile DC classes

[wxWidgets.git] / include / wx / msw / icon.h

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index ac8695bdb709a7873a28a2276993c8952096e1b4..4fa08e2f6a5db1a5707a36ac9e2761479230b24a 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -12,10 +12,6 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "icon.h"
-#endif
-
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
@@ -49,7 +45,7 @@ public:
     wxIcon() { }
 
         // copy
-    wxIcon(const wxIcon& icon) { Ref(icon); }
+    wxIcon(const wxIcon& icon) : wxGDIImage(icon) { Ref(icon); }
 
         // from raw data
     wxIcon(const char bits[], int width, int height);
@@ -96,6 +92,8 @@ protected:
         return new wxIconRefData;
     }
 
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+
     // create from XPM data
     void CreateIconFromXpm(const char **data);