X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbe4a80c57a77b249ef32117efe9fd923066f958..3570a1c6e596c358848c77c5b37d724097340ce8:/src/mac/carbon/colour.cpp?ds=sidebyside diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp index 225e31e179..4d91726650 100644 --- a/src/mac/carbon/colour.cpp +++ b/src/mac/carbon/colour.cpp @@ -38,10 +38,6 @@ void wxColour::GetRGBColor( RGBColor *col ) const col->green = (m_green << 8) + m_green; } -wxColour::~wxColour () -{ -} - wxColour& wxColour::operator=(const RGBColor& col) { InitRGBColor(col); @@ -54,9 +50,14 @@ wxColour& wxColour::operator=(CGColorRef col) return *this; } -bool wxColour::IsOk() const +wxColour& wxColour::operator=(const wxColour& col) { - return m_cgColour; + m_red = col.m_red; + m_green = col.m_green; + m_blue = col.m_blue; + m_alpha = col.m_alpha; + m_cgColour = col.m_cgColour; + return *this; } void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelType a)