title-less windows also for windows

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

diff --git a/src/mac/colour.cpp b/src/mac/colour.cpp
index 8d0827ef1d7f1536832bf8c34eb3feb2e154cecb..5755910b267b247478910f10a1425e14bf586cd8 100644 (file)
--- a/src/mac/colour.cpp
+++ b/src/mac/colour.cpp
@@ -22,13 +22,23 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 // Colour
 
 
 // Colour
 

+#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;
+}
+

 wxColour::wxColour ()
 {
 wxColour::wxColour ()
 {

-    m_isInit = FALSE;
-    m_red = m_blue = m_green = 0;
-/* TODO
-    m_pixel = 0;
-*/
+  m_isInit = FALSE;
+  m_red = m_blue = m_green = 0;
+
+       wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;

 }
 
 wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
 }
 
 wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)


@@ -37,20 +47,29 @@ wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
     m_green = g;
     m_blue = b;
     m_isInit = TRUE;
     m_green = g;
     m_blue = b;
     m_isInit = TRUE;

-/* TODO
-    m_pixel = PALETTERGB (m_red, m_green, m_blue);
-*/
+
+       wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;

 }
 
 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;

-/* TODO
-    m_pixel = col.m_pixel;
-*/
+
+    memcpy( &m_pixel , &col.m_pixel , 6 ) ;
+}
+
+wxColour::wxColour (const wxColour* col)
+{
+    m_red = col->m_red;
+    m_green = col->m_green;
+    m_blue = col->m_blue;
+    m_isInit = col->m_isInit;
+
+    memcpy( &m_pixel , &col->m_pixel , 6 ) ;

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


@@ -59,9 +78,9 @@ wxColour& wxColour::operator =(const wxColour& col)
   m_green = col.m_green;
   m_blue = col.m_blue;
   m_isInit = col.m_isInit;
   m_green = col.m_green;
   m_blue = col.m_blue;
   m_isInit = col.m_isInit;

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

   return *this;
 }
 
   return *this;
 }
 


@@ -82,9 +101,8 @@ void wxColour::InitFromName(const wxString& col)
         m_blue = 0;
         m_isInit = FALSE;
     }
         m_blue = 0;
         m_isInit = FALSE;
     }

-/* TODO
-    m_pixel = PALETTERGB (m_red, m_green, m_blue);
-*/
+
+       wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;

 }
 
 wxColour::~wxColour ()
 }
 
 wxColour::~wxColour ()


@@ -97,7 +115,15 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
     m_green = g;
     m_blue = b;
     m_isInit = TRUE;
     m_green = g;
     m_blue = b;
     m_isInit = TRUE;

-/* TODO
-    m_pixel = PALETTERGB (m_red, m_green, m_blue);
-*/
+
+       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 ;

 }
 }