X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaf7ab431b85d817af39d1a19b6d392ff5bd9379..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/include/wx/msw/icon.h?ds=sidebyside diff --git a/include/wx/msw/icon.h b/include/wx/msw/icon.h index f9a08a3c91..c4b420937c 100644 --- a/include/wx/msw/icon.h +++ b/include/wx/msw/icon.h @@ -12,10 +12,6 @@ #ifndef _WX_ICON_H_ #define _WX_ICON_H_ -#ifdef __GNUG__ - #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,13 +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 - { return m_refData != icon.m_refData; } - // implementation only from now on wxIconRefData *GetIconData() const { return (wxIconRefData *)m_refData; } @@ -96,6 +82,8 @@ protected: return new wxIconRefData; } + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + // create from XPM data void CreateIconFromXpm(const char **data);