Added log.h inclusion

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

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index cc549b5f1144e11e602a5fad4b94f8132ab95a14..5755910b267b247478910f10a1425e14bf586cd8 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -22,9 +22,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // Colour
 
 
 // Colour
 

-static void wxComposeRGBColor( RGBColor * col , int red, int blue, int green ) ;
-static void wxComposeRGBColor( RGBColor * col , int red, int blue, int green ) 
+#include "wx/mac/private.h"
+
+static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) ;
+static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) 

 {
 {

+    RGBColor* col = (RGBColor*) color ;

        col->red = (red << 8) + red;
        col->blue = (blue << 8) + blue;
        col->green = (green << 8) + green;
        col->red = (red << 8) + red;
        col->blue = (blue << 8) + blue;
        col->green = (green << 8) + green;


@@ -49,13 +52,14 @@ wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
 }
 
 wxColour::wxColour (const wxColour& col)
 }
 
 wxColour::wxColour (const wxColour& col)

+    : wxObject()

 {
     m_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;
     m_isInit = col.m_isInit;
 
 {
     m_red = col.m_red;
     m_green = col.m_green;
     m_blue = col.m_blue;
     m_isInit = col.m_isInit;
 

-    m_pixel = col.m_pixel;
+    memcpy( &m_pixel , &col.m_pixel , 6 ) ;

 }
 
 wxColour::wxColour (const wxColour* col)
 }
 
 wxColour::wxColour (const wxColour* col)


@@ -65,7 +69,7 @@ wxColour::wxColour (const wxColour* col)
     m_blue = col->m_blue;
     m_isInit = col->m_isInit;
 
     m_blue = col->m_blue;
     m_isInit = col->m_isInit;
 

-    m_pixel = col->m_pixel;
+    memcpy( &m_pixel , &col->m_pixel , 6 ) ;

 }
 
 wxColour& wxColour::operator =(const wxColour& col)
 }
 
 wxColour& wxColour::operator =(const wxColour& col)


@@ -75,7 +79,7 @@ wxColour& wxColour::operator =(const wxColour& col)
   m_blue = col.m_blue;
   m_isInit = col.m_isInit;
  
   m_blue = col.m_blue;
   m_isInit = col.m_isInit;
  

-  m_pixel = col.m_pixel;
+  memcpy( &m_pixel , &col.m_pixel , 6 ) ;

 
   return *this;
 }
 
   return *this;
 }


@@ -114,3 +118,12 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
 
        wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }
 
        wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
 }

+
+void wxColour::Set( const 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 ;
+}