X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a789c01d261ce61fd7aeb46998cb1c366a18666a..e7300ec6d9ebbd1cfa2fcf12c0ce6e5aee85a152:/include/wx/mac/colour.h?ds=inline diff --git a/include/wx/mac/colour.h b/include/wx/mac/colour.h index a811708f72..13f24cc716 100644 --- a/include/wx/mac/colour.h +++ b/include/wx/mac/colour.h @@ -68,7 +68,8 @@ public: // comparison bool operator == (const wxColour& colour) const { - return (m_red == colour.m_red && + return (m_isInit == colour.m_isInit && + m_red == colour.m_red && m_green == colour.m_green && m_blue == colour.m_blue); } @@ -76,7 +77,7 @@ public: void InitFromName(const wxString& col); - const WXCOLORREF GetPixel() const { return m_pixel; }; + const WXCOLORREF& GetPixel() const { return m_pixel; }; private: bool m_isInit; @@ -86,7 +87,7 @@ private: public: WXCOLORREF m_pixel ; - void Set( WXCOLORREF color ) { m_pixel = color ; m_red = m_pixel.red>>8 ;m_blue = m_pixel.blue>>8 ;m_green = m_pixel.green>>8 ;} + void Set( const WXCOLORREF* color ) ; private: DECLARE_DYNAMIC_CLASS(wxColour)