X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..cd4e32afe7023f2ebc97b15674ee3b7def480e45:/include/wx/msw/icon.h diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index 34848d8dee..8682193961 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -6,16 +6,12 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "icon.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -48,9 +44,6 @@ public: // default wxIcon() { } - // copy - wxIcon(const wxIcon& icon) { Ref(icon); } - // from raw data wxIcon(const char bits[], int width, int height); @@ -72,8 +65,6 @@ public: long type = wxBITMAP_TYPE_ICO_RESOURCE, int desiredWidth = -1, int desiredHeight = -1); - wxIcon& operator = (const wxIcon& icon) - { if ( *this != icon ) Ref(icon); return *this; } bool operator == (const wxIcon& icon) const { return m_refData == icon.m_refData; } bool operator != (const wxIcon& icon) const @@ -96,6 +87,8 @@ protected: return new wxIconRefData; } + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + // create from XPM data void CreateIconFromXpm(const char **data);