fixed wxColour::operator==

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-05-08 18:43:54 +00:00
parent f87a708b14
commit 615dca338b

View File

@@ -35,7 +35,6 @@ public:
// copy ctors and assignment operators // copy ctors and assignment operators
wxColour( const wxColour& col ); wxColour( const wxColour& col );
/* wxColour( const wxColour* col ); */
wxColour& operator = ( const wxColour& col ); wxColour& operator = ( const wxColour& col );
// dtor // dtor
@@ -67,10 +66,12 @@ public:
// comparison // comparison
bool operator==(const wxColour& colour) const bool operator==(const wxColour& colour) const
{ {
return (m_red == colour.m_red && return m_isInit == colour.m_isInit &&
m_red == colour.m_red &&
m_green == colour.m_green && m_green == colour.m_green &&
m_blue == colour.m_blue); m_blue == colour.m_blue;
} }
bool operator != (const wxColour& colour) const { return !(*this == colour); } bool operator != (const wxColour& colour) const { return !(*this == colour); }
WXCOLORREF GetPixel() const { return m_pixel; }; WXCOLORREF GetPixel() const { return m_pixel; };