X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/01111366c9b4ea40eee7f4b13ddfe6f6b9f886db..31d80f31afd5e78f86d3d9e8e52d7124aac36a32:/include/wx/gtk1/colour.h?ds=sidebyside diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h index 77e4155350..8d27d3f3b2 100644 --- 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;