X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c58ae5f298f4f052e22bf544d1249cf9572770f8..27b2dd53f629a78266c51d1b0b5db918401dcd4f:/include/wx/cocoa/colour.h diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h index 8d8671f060..9200c35502 100644 --- a/include/wx/cocoa/colour.h +++ b/include/wx/cocoa/colour.h @@ -31,6 +31,9 @@ public: : m_cocoaNSColor(NULL) { Set(colRGB); } + // initialization using existing NSColor + wxColour( WX_NSColor aColor ); + // implicit conversion from the colour name wxColour( const wxString &colourName ) { InitFromName(colourName); } @@ -57,11 +60,11 @@ public: // comparison bool operator == (const wxColour& colour) const { - // VZ: sure we want to compare NSColor objects for equality here? + // TODO: Really compare the NSColor return (m_cocoaNSColor == colour.m_cocoaNSColor - && m_red == colour.m_red + || (m_red == colour.m_red && m_green == colour.m_green - && m_blue == colour.m_blue); + && m_blue == colour.m_blue)); } bool operator != (const wxColour& colour) const { return !(*this == colour); } @@ -76,6 +79,7 @@ public: (unsigned char)(colRGB >> 8), (unsigned char)(colRGB >> 16)); } + void Set( WX_NSColor aColor ); protected: // puts the object in an invalid, uninitialized state