removed the file setup.h - copy setup0.h into setup.h and make your changes

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

diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h
index fabd5ad99c26e650518faf784cf7aabc9b90bbaf..52f15ed96fb825f8ea9ff3e15a7daf00bd6a281d 100644 (file)
--- a/include/wx/msw/colour.h
+++ b/include/wx/msw/colour.h
@@ -24,11 +24,14 @@ public:
     // default
   wxColour();
     // from RGB
-  wxColour( char red, char green, char blue );
+  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 );
@@ -63,8 +66,8 @@ public:
   // comparison
   bool operator == (const wxColour& colour)
   {
-    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); }