1. some minor but nasty bugs fixed (see post to the list)

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

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 77e4155350d8447ca57fdb60cf651ce90c8a8833..8d27d3f3b2ad32f7cd08f9166749b76d3867c174 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -2,9 +2,9 @@
 // Name:        colour.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $id$
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -43,25 +43,35 @@ 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 );
   wxColour& operator = ( const wxColour& col );
 
     // dtor
   ~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;