X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/mac/classic/icon.h diff --git a/include/wx/mac/classic/icon.h b/include/wx/mac/classic/icon.h index 2a1c001690..841fd38810 100644 --- a/include/wx/mac/classic/icon.h +++ b/include/wx/mac/classic/icon.h @@ -6,16 +6,12 @@ // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// 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 - #include "wx/bitmap.h" // Icon @@ -24,11 +20,6 @@ class WXDLLEXPORT wxIcon: public wxBitmap public: wxIcon(); - // Copy constructors - wxIcon(const wxIcon& icon) - : wxBitmap() - { Ref(icon); } - wxIcon(const char **data); wxIcon(char **data); wxIcon(const char bits[], int width , int height ); @@ -38,15 +29,13 @@ public: { LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ICON); } - ~wxIcon(); + virtual ~wxIcon(); bool LoadFile(const wxString& name, wxBitmapType flags /* = wxBITMAP_TYPE_ICON_RESOURCE */ , int desiredWidth /* = -1 */ , int desiredHeight = -1); bool LoadFile(const wxString& name ,wxBitmapType flags = wxBITMAP_TYPE_ICON_RESOURCE ) { return LoadFile( name , flags , -1 , -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 !(*this == icon); }