X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afce4c035fffa13edcb0241d84dbae93ae3ee1e3..b4b830ec00c099ae83596fa3fe9d8a4398fd2929:/include/wx/motif/icon.h diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 3ac1eb4450..8042fb8f06 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -48,6 +48,7 @@ public: wxIcon(const char bits[], int width, int height); // Initialize with XPM data + wxIcon(const char **data); wxIcon(char **data); wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_XPM, @@ -56,12 +57,10 @@ public: bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM, int desiredWidth = -1, int desiredHeight = -1); - bool LoadFile(const wxString& name, long type = wxBITMAP_TYPE_XBM) - { return wxBitmap::LoadFile(name, type); } inline wxIcon& operator = (const wxIcon& icon) { if (*this == icon) return (*this); Ref(icon); return *this; } - inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; } - inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; } + inline bool operator == (const wxIcon& icon) const { return m_refData == icon.m_refData; } + inline bool operator != (const wxIcon& icon) const { return m_refData != icon.m_refData; } virtual bool Ok() const { return ((m_refData != NULL) && (M_ICONDATA->m_ok)); } };