X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f97c985452b20a8c2f0bbfb1d0275298bf09fb45..d42508c2a026d505d39c386b233de4a1b51f1445:/include/wx/motif/icon.h?ds=sidebyside diff --git a/include/wx/motif/icon.h b/include/wx/motif/icon.h index 92eb0eccfc..d1176761c5 100644 --- a/include/wx/motif/icon.h +++ b/include/wx/motif/icon.h @@ -43,24 +43,26 @@ public: // Copy constructors inline wxIcon(const wxIcon& icon) { Ref(icon); } - inline wxIcon(const wxIcon* icon) { if (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, 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); + 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)); } };