X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6f12c2c9555e3498d5c27c9245f1bcaec2bcd2c2..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/motif/icon.h diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index eea99e4055..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(__APPLE__) -#pragma interface "icon.h" -#endif - #include "wx/bitmap.h" // Icon @@ -23,17 +19,14 @@ 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); - + // Initialize with XPM data wxIcon(const char **data); wxIcon(char **data); - + wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM, int desiredWidth = -1, int desiredHeight = -1) { @@ -45,25 +38,25 @@ public: LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY); } - ~wxIcon(); - - bool LoadFile(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM, - int desiredWidth = -1, int desiredHeight = -1); + virtual ~wxIcon(); + + bool LoadFile(const wxString& name, wxBitmapType type, + int desiredWidth, int desiredHeight = -1); + + // unhide base class LoadFile() + virtual bool LoadFile(const wxString& name, + wxBitmapType type = wxBITMAP_TYPE_XPM) + { + return LoadFile(name, type, -1, -1); + } // create from bitmap (which should have a mask unless it's monochrome): // there shouldn't be any implicit bitmap -> icon conversion (i.e. no // 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); + DECLARE_DYNAMIC_CLASS(wxIcon) }; #endif // _WX_ICON_H_