X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/564a150b1f7c63a060c1b205a7cd50035031cd4b..3ef37e7f4ec5f0688a4fb47e530ca2d30a6bb3ed:/include/wx/mac/colour.h diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h index 88deff7b3c..158e631d64 100644 --- a/include/wx/mac/colour.h +++ b/include/wx/mac/colour.h @@ -31,7 +31,7 @@ public: { Set(red, green, blue); } wxColour( unsigned long colRGB ) { Set(colRGB); } - + // implicit conversion from the colour name wxColour( const wxString &colourName ) { InitFromName(colourName); } @@ -67,25 +67,28 @@ public: // comparison bool operator == (const wxColour& colour) const { - return (m_isInit == colour.m_isInit && - m_red == colour.m_red && - m_green == colour.m_green && - m_blue == colour.m_blue); + return (m_isInit == colour.m_isInit + && m_red == colour.m_red + && m_green == colour.m_green + && m_blue == colour.m_blue); } bool operator != (const wxColour& colour) const { return !(*this == colour); } - void InitFromName(const wxString& col); - const WXCOLORREF& GetPixel() const { return m_pixel; }; + void InitFromName(const wxString& col); + +protected : + + // Helper function + void Init(); + private: bool m_isInit; unsigned char m_red; unsigned char m_blue; unsigned char m_green; - void Init(); - public: WXCOLORREF m_pixel ; void Set( const WXCOLORREF* color ) ;