X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/925f7740663f38ed8296ddb247754a9d62152aea..a4f6fe43c33bd7933645d110ad2719871dab043d:/include/wx/motif/icon.h diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 3508a84d3e..efadb28ba1 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -15,7 +15,7 @@ #include "wx/bitmap.h" // Icon -class WXDLLEXPORT wxIcon : public wxBitmap +class WXDLLIMPEXP_CORE wxIcon : public wxBitmap { public: wxIcon(); @@ -24,10 +24,12 @@ public: 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); +#endif - wxIcon(const wxString& name, wxBitmapType type = wxBITMAP_TYPE_XPM, + wxIcon(const wxString& name, wxBitmapType type = wxICON_DEFAULT_TYPE, int desiredWidth = -1, int desiredHeight = -1) { LoadFile(name, type, desiredWidth, desiredHeight); @@ -38,28 +40,21 @@ public: LoadFile(loc.GetFileName(), wxBITMAP_TYPE_ANY); } - ~wxIcon(); + virtual ~wxIcon(); bool LoadFile(const wxString& name, wxBitmapType type, - int desiredWidth, int desiredHeight = -1); + int desiredWidth, int desiredHeight); - // unhide base class LoadFile() + // unhide the base class version virtual bool LoadFile(const wxString& name, - wxBitmapType type = wxBITMAP_TYPE_XPM) - { - return LoadFile(name, type, -1, -1); - } + 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); - 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) };