X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f84a986cfc6e512240b77fcdfbacc769b8a0cd02..9cd808434c01b4e2e5ac9f0c0844eac3af672c98:/src/mac/carbon/colour.cpp diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp index 6a3562c3d4..d752b70530 100644 --- a/src/mac/carbon/colour.cpp +++ b/src/mac/carbon/colour.cpp @@ -21,7 +21,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ); +wxColour::wxColour(const RGBColor& col) +{ + FromRGBColor((WXCOLORREF *)&col); +} + static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) { RGBColor* col = (RGBColor*) color; @@ -64,6 +68,12 @@ void wxColour::FromRGBColor( WXCOLORREF* color ) m_green = col->green >> 8; } +wxColour& wxColour::operator=(const RGBColor& col) +{ + FromRGBColor((WXCOLORREF *)&col); + return *this; +} + bool wxColour::IsOk() const { return m_isInit;