X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaf7ab431b85d817af39d1a19b6d392ff5bd9379..32485259c1342115488d219776dfebeb3d4d81b1:/include/wx/msw/icon.h?ds=sidebyside diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index f9a08a3c91..f7e3f41ad1 100644 --- 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,7 +49,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 +96,8 @@ protected: return new wxIconRefData; } + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + // create from XPM data void CreateIconFromXpm(const char **data);