making sure it is only breaking at newlines for measuring

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

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 9fa04b0464024270b06ade79e0d9890011f49130..6a3562c3d43f2f33cff8fd3166bb6e9eac853559 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -44,7 +44,7 @@ wxColour::~wxColour ()
 {
 }
 
-void wxColour::InitWith (unsigned char r, unsigned char g, unsigned char b, unsigned char a)
+void wxColour::InitRGBA (unsigned char r, unsigned char g, unsigned char b, unsigned char a)
 {
     m_red = r;
     m_green = g;
@@ -55,7 +55,7 @@ void wxColour::InitWith (unsigned char r, unsigned char g, unsigned char b, unsi
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green );
 }
 
-void wxColour::FromRGBColor( const WXCOLORREF* color )
+void wxColour::FromRGBColor( WXCOLORREF* color )
 {
     RGBColor* col = (RGBColor*) color;
     memcpy( &m_pixel, color, 6 );
@@ -63,3 +63,9 @@ void wxColour::FromRGBColor( const WXCOLORREF* color )
     m_blue = col->blue >> 8;
     m_green = col->green >> 8;
 }
+
+bool wxColour::IsOk() const 
+{
+    return m_isInit; 
+}
+