fixed wxColour::operator==

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10061 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 3f0c568c4ac4ff5943ee68059c9e8bb9647f02c4..d82c1dc1cf3a13f61f1dc4b7d5d9024ade7d3904 100644 (file)
--- 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 );
 
     // copy ctors and assignment operators
   wxColour( const wxColour& col );

-/*  wxColour( const wxColour* col ); */

   wxColour& operator = ( const wxColour& col );
 
     // dtor
   wxColour& operator = ( const wxColour& col );
 
     // dtor


@@ -65,12 +64,14 @@ public:
   unsigned char Blue() const { return m_blue; }
 
   // comparison
   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; };
   bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
   WXCOLORREF GetPixel() const { return m_pixel; };