Moved the declaration of wxEVT_NULL to event.cpp and made it extern in the header...

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

diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h
index 72d724cab13b8b7aa40f102efedba4ed58dbe09c..8d27d3f3b2ad32f7cd08f9166749b76d3867c174 100644 (file)
--- a/include/wx/gtk1/colour.h
+++ b/include/wx/gtk1/colour.h
@@ -4,7 +4,7 @@
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 


@@ -44,24 +44,34 @@ public:
   wxColour();
     // from RGB
   wxColour( unsigned char red, unsigned char green, unsigned char blue );
   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 );
     // 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
   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 );
   // 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;
   unsigned char Red() const;
   unsigned char Green() const;
   unsigned char Blue() const;