X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e4a81a2e96b5a349ee9430b91d36e7e8a21d7976..908d45166b3dbe175746fd8145e331e805193aba:/include/wx/msw/colour.h diff --git a/include/wx/msw/colour.h b/include/wx/msw/colour.h index fabd5ad99c..0c3def2984 100644 --- a/include/wx/msw/colour.h +++ b/include/wx/msw/colour.h @@ -24,11 +24,14 @@ 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 ); @@ -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; };