cleanup

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

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 9fa04b0464024270b06ade79e0d9890011f49130..4af845a7e445e3e7c4e8a478b6a23bf47d77a07f 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;


@@ -44,7 +48,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;
 {
     m_red = r;
     m_green = g;


@@ -55,11 +59,24 @@ void wxColour::InitWith (unsigned char r, unsigned char g, unsigned char b, unsi
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green );
 }
 
     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 );
     m_red = col->red >> 8;
     m_blue = col->blue >> 8;
     m_green = col->green >> 8;
 {
     RGBColor* col = (RGBColor*) color;
     memcpy( &m_pixel, color, 6 );
     m_red = col->red >> 8;
     m_blue = col->blue >> 8;
     m_green = col->green >> 8;

+    m_alpha = 255;
+}
+
+wxColour& wxColour::operator=(const RGBColor& col)
+{
+    FromRGBColor((WXCOLORREF *)&col);
+    return *this;

 }
 }

+
+bool wxColour::IsOk() const 
+{
+    return m_isInit; 
+}
+