corrected conditional include

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

diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h
index ff686d2e0670032693d904ccb96b2ad4a49979f8..8d27d3f3b2ad32f7cd08f9166749b76d3867c174 100644 (file)
--- a/include/wx/gtk/colour.h
+++ b/include/wx/gtk/colour.h
@@ -44,6 +44,8 @@ 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); }
@@ -56,11 +58,20 @@ public:
   ~wxColour();
 
   // comparison
-  bool operator == ( const wxColour& col );
-  bool operator != ( const wxColour& col );
+  bool operator == ( const wxColour& col ) const;
+  bool operator != ( const wxColour& col ) const;
 
   // accessors
   void Set( unsigned char red, unsigned char green, unsigned char blue );
+  void Set( unsigned long colRGB )
+  {
+    // we don't need to know sizeof(long) here because we assume that the three
+    // least significant bytes contain the R, G and B values
+    Set((unsigned char)colRGB,
+        (unsigned char)(colRGB >> 8),
+        (unsigned char)(colRGB >> 16));
+  }
+
   unsigned char Red() const;
   unsigned char Green() const;
   unsigned char Blue() const;