X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87832b70c5ee031258cfb71ff16ef3baa5af347d..8a0681f9338345d0ef32b2ad809d49fd20861119:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 4770bf7a53..2cf5908c8b 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -15,6 +15,7 @@ #ifdef __GNUG__ #pragma interface "colour.h" #endif +#include "wx/object.h" // Colour class WXDLLEXPORT wxColour: public wxObject @@ -25,10 +26,13 @@ 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); } + // copy ctors and assignment operators wxColour( const wxColour& col ); wxColour( const wxColour* col ); @@ -61,13 +65,13 @@ public: unsigned char Blue() const { return m_blue; } // comparison - bool operator == (const wxColour& colour) + bool operator == (const wxColour& colour) const { - 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); } + bool operator != (const wxColour& colour) const { return !(*this == colour); } WXCOLORREF GetPixel() const { return m_pixel; };