made operator==() and \!=() const (still doesn't make them correct probably)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -45,9 +45,9 @@ public:
|
|||||||
}
|
}
|
||||||
wxIcon( char **bits, int width=-1, int height=-1 );
|
wxIcon( char **bits, int width=-1, int height=-1 );
|
||||||
|
|
||||||
wxIcon& operator = (const wxIcon& icon);
|
wxIcon& operator=(const wxIcon& icon);
|
||||||
inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
|
bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
|
||||||
inline bool operator != (const wxIcon& icon) { 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):
|
// create from bitmap (which should have a mask unless it's monochrome):
|
||||||
// there shouldn't be any implicit bitmap -> icon conversion (i.e. no
|
// there shouldn't be any implicit bitmap -> icon conversion (i.e. no
|
||||||
|
@@ -45,9 +45,9 @@ public:
|
|||||||
}
|
}
|
||||||
wxIcon( char **bits, int width=-1, int height=-1 );
|
wxIcon( char **bits, int width=-1, int height=-1 );
|
||||||
|
|
||||||
wxIcon& operator = (const wxIcon& icon);
|
wxIcon& operator=(const wxIcon& icon);
|
||||||
inline bool operator == (const wxIcon& icon) { return m_refData == icon.m_refData; }
|
bool operator==(const wxIcon& icon) const { return m_refData == icon.m_refData; }
|
||||||
inline bool operator != (const wxIcon& icon) { 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):
|
// create from bitmap (which should have a mask unless it's monochrome):
|
||||||
// there shouldn't be any implicit bitmap -> icon conversion (i.e. no
|
// there shouldn't be any implicit bitmap -> icon conversion (i.e. no
|
||||||
|
Reference in New Issue
Block a user