X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0ed460c2e7802793d591c84f3cfdbff159c5549..b1d66b5415f7befb45e050d7097571642b8bfa56:/include/wx/motif/colour.h diff --git a/include/wx/motif/colour.h b/include/wx/motif/colour.h index 7059f61441..238d46cfe1 100644 --- a/include/wx/motif/colour.h +++ b/include/wx/motif/colour.h @@ -29,6 +29,8 @@ 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); } @@ -60,9 +62,9 @@ public: int GetPixel() const { return m_pixel; }; void SetPixel(int pixel) { m_pixel = pixel; m_isInit = TRUE; }; - inline bool operator == (const wxColour& colour) { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); } + inline bool operator == (const wxColour& colour) const { return (m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); } - inline bool operator != (const wxColour& colour) { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); } + inline bool operator != (const wxColour& colour) const { return (!(m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue)); } // Allocate a colour, or nearest colour, using the given display. // If realloc is TRUE, ignore the existing pixel, otherwise just return