added the static function GetLabelText() to wxStaticText which was mentioned in the...

[wxWidgets.git] / src / mac / carbon / colour.cpp

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 2572be337b952987cab1798446c0896abb8b8863..d752b70530579cb57e3fe62123e151a8de88f3dd 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -21,7 +21,11 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 
 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;
 static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green )
 {
     RGBColor* col = (RGBColor*) color;


@@ -63,3 +67,15 @@ void wxColour::FromRGBColor( WXCOLORREF* color )
     m_blue = col->blue >> 8;
     m_green = col->green >> 8;
 }
     m_blue = col->blue >> 8;
     m_green = col->green >> 8;
 }

+
+wxColour& wxColour::operator=(const RGBColor& col)
+{
+    FromRGBColor((WXCOLORREF *)&col);
+    return *this;
+}
+
+bool wxColour::IsOk() const 
+{
+    return m_isInit; 
+}
+