X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ed460c2e7802793d591c84f3cfdbff159c5549..8366ae934aab9f835747b0c2e456231e8795fe78:/include/wx/motif/icon.h diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 89f048ab15..8042fb8f06 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -48,18 +48,19 @@ 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_ICO_RESOURCE, + wxIcon(const wxString& name, long flags = wxBITMAP_TYPE_XPM, int desiredWidth = -1, int desiredHeight = -1); ~wxIcon(); - bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_ICO_RESOURCE, + bool LoadFile(const wxString& name, long flags = wxBITMAP_TYPE_XPM, int desiredWidth = -1, int desiredHeight = -1); 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)); } };