X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edf6a063410b3fa401c913153a64f81d700fbda4..7f0586ef60f9ac456ebad639026c14ed89d46c8b:/include/wx/x11/icon.h?ds=sidebyside diff --git a/include/wx/x11/icon.h b/include/wx/x11/icon.h index 1f3314b6bd..95ec79f429 100644 --- a/include/wx/x11/icon.h +++ b/include/wx/x11/icon.h @@ -38,9 +38,14 @@ public: } wxIcon( char **bits, int width=-1, int height=-1 ); - wxIcon& operator = (const wxIcon& icon); - inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; } - inline bool operator != (const wxIcon& icon) { return m_refData != icon.m_refData; } + wxIcon(const wxIconLocation& loc) + : wxBitmap(loc.GetFileName(), wxBITMAP_TYPE_XPM) + { + } + + wxIcon& operator=(const wxIcon& icon); + bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; } + bool operator!=(const wxIcon& icon) const { return !(*this == icon); } // create from bitmap (which should have a mask unless it's monochrome): // there shouldn't be any implicit bitmap -> icon conversion (i.e. no