X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d54b9d29706dbb43de5624bdf4a2aaa74b2350b..b052a864e9d5270fd40f9ee6021133d2c3cd3173:/include/wx/motif/icon.h diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 9d246c7303..0be2892759 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -1,21 +1,17 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: icon.h +// Name: wx/motif/icon.h // Purpose: wxIcon class // Author: Julian Smart // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows 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,9 +20,6 @@ class WXDLLEXPORT wxIcon : public wxBitmap public: wxIcon(); - // Copy constructors - inline wxIcon(const wxIcon& icon) { Ref(icon); } - // Initialize with XBM data wxIcon(const char bits[], int width, int height); @@ -45,7 +38,7 @@ public: LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY); } - ~wxIcon(); + virtual ~wxIcon(); bool LoadFile(const wxString& name, wxBitmapType type, int desiredWidth, int desiredHeight = -1); @@ -62,13 +55,6 @@ public: // ctors, assignment operators...), but it's ok to have such function void CopyFromBitmap(const wxBitmap& bmp); - 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); } - DECLARE_DYNAMIC_CLASS(wxIcon) };