added MSWPrintChild() for drawing child background (replaces patch 1108389)

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

diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h
index 741874298ca04f746b5409c054455f68229d33ef..f7e3f41ad1a97820e4917d83eaa9d6894166dbdd 100644 (file)
--- a/include/wx/msw/icon.h
+++ b/include/wx/msw/icon.h
@@ -12,7 +12,7 @@
 #ifndef _WX_ICON_H_
 #define _WX_ICON_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma interface "icon.h"
 #endif
 
@@ -49,18 +49,23 @@ 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);
+
         // from XPM data
     wxIcon(const char **data) { CreateIconFromXpm(data); }
+
     wxIcon(char **data) { CreateIconFromXpm((const char **)data); }
+
         // from resource/file
     wxIcon(const wxString& name,
            long type = wxBITMAP_TYPE_ICO_RESOURCE,
            int desiredWidth = -1, int desiredHeight = -1);
 
+    wxIcon(const wxIconLocation& loc);
+
     virtual ~wxIcon();
 
     virtual bool LoadFile(const wxString& name,
@@ -91,6 +96,8 @@ protected:
         return new wxIconRefData;
     }
 
+    virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const;
+
     // create from XPM data
     void CreateIconFromXpm(const char **data);