X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/777105f2b7f91a17fab7d9c4808e282547bb9393..1f0acb435592470b421b80df854fbbb08cd2853f:/include/wx/motif/icon.h?ds=sidebyside diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index e6d52926ea..efadb28ba1 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -1,40 +1,35 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 -class WXDLLEXPORT wxIcon : public wxBitmap +class WXDLLIMPEXP_CORE 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(const char* const* data); +#ifdef wxNEEDS_CHARPP wxIcon(char **data); - - wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM, +#endif + + wxIcon(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1) { LoadFile(name, type, desiredWidth, desiredHeight); @@ -45,22 +40,20 @@ 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); + + // unhide the base class version + virtual bool LoadFile(const wxString& name, + wxBitmapType flags = wxICON_DEFAULT_TYPE) + { return LoadFile(name, flags); } // 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)