Reworked the undef stuff a little

[wxWidgets.git] / include / wx / msw / colour.h

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index 4770bf7a53ba58ac5b0ad757289efb65979bae5a..0c3def29846bab5669cca887b3b348b3e3b384e6 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -25,10 +25,13 @@ public:
   wxColour();
     // from RGB
   wxColour( unsigned char red, unsigned char green, unsigned char blue );
+  wxColour( unsigned long colRGB ) { Set(colRGB); }
+
     // implicit conversion from the colour name
   wxColour( const wxString &colourName ) { InitFromName(colourName); }
   wxColour( const char *colourName ) { InitFromName(colourName); }
 
+
     // copy ctors and assignment operators
   wxColour( const wxColour& col );
   wxColour( const wxColour* col );
@@ -61,13 +64,13 @@ public:
   unsigned char Blue() const { return m_blue; }
 
   // comparison
-  bool operator == (const wxColour& colour)
+  bool operator == (const wxColour& colour) const
   {
-    return (m_red == colour.m_red && 
-            m_green == colour.m_green && 
+    return (m_red == colour.m_red &&
+            m_green == colour.m_green &&
             m_blue == colour.m_blue);
   }
-  bool operator != (const wxColour& colour) { return !(*this == colour); }
+  bool operator != (const wxColour& colour) const { return !(*this == colour); }
 
   WXCOLORREF GetPixel() const { return m_pixel; };