X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4b5f3fe655deeb91d5d3abe8fad30c4a1cae63dc..9e3e08210272082c5fcd427d14ebde86f60002a0:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index 08f4e8ef17..0c3def2984 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -25,13 +25,16 @@ 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 ); + wxColour( const wxColour* col ); wxColour& operator = ( const wxColour& col ); // dtor @@ -61,13 +64,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; };