From 615dca338b4c3214c30b84c45f3ebecfc3c9c98b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 8 May 2001 18:43:54 +0000 Subject: [PATCH] fixed wxColour::operator== git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/colour.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 3f0c568c4a..d82c1dc1cf 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -35,7 +35,6 @@ public: // copy ctors and assignment operators wxColour( const wxColour& col ); -/* wxColour( const wxColour* col ); */ wxColour& operator = ( const wxColour& col ); // dtor @@ -65,12 +64,14 @@ public: unsigned char Blue() const { return m_blue; } // comparison - bool operator == (const wxColour& colour) const + bool operator==(const wxColour& colour) const { - return (m_red == colour.m_red && - m_green == colour.m_green && - m_blue == colour.m_blue); + return m_isInit == colour.m_isInit && + m_red == colour.m_red && + m_green == colour.m_green && + m_blue == colour.m_blue; } + bool operator != (const wxColour& colour) const { return !(*this == colour); } WXCOLORREF GetPixel() const { return m_pixel; }; -- 2.45.2