Changed system colours for better default display of wxGrid. Please revert

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

diff --git a/src/mac/colour.cpp b/src/mac/colour.cpp
index 8d0827ef1d7f1536832bf8c34eb3feb2e154cecb..68abfa77bd2bec2d26134546ad9cbb0a76007813 100644 (file)
--- a/src/mac/colour.cpp
+++ b/src/mac/colour.cpp
@@ -16,19 +16,24 @@
 #include "wx/gdicmn.h"
 #include "wx/colour.h"
 
 #include "wx/gdicmn.h"
 #include "wx/colour.h"
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)

-#endif

 
 // Colour
 
 
 // Colour
 

+static void wxComposeRGBColor( RGBColor * col , int red, int blue, int green ) ;
+static void wxComposeRGBColor( RGBColor * col , int red, int blue, int green ) 
+{
+       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,9 +42,8 @@ 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)


@@ -48,9 +52,18 @@ wxColour::wxColour (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;
     m_pixel = col.m_pixel;

-*/
+}
+
+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;
+
+    m_pixel = col->m_pixel;

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


@@ -59,9 +72,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;
   m_pixel = col.m_pixel;

-*/
+

   return *this;
 }
 
   return *this;
 }
 


@@ -82,9 +95,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 +109,6 @@ 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 ) ;

 }
 }