Commited scrollbar patch which sends lineup, linedown

[wxWidgets.git] / src / cocoa / colour.mm

diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm
index 418043aa04fe3323620d5c0c4943caf43548c92c..b1aa432a3ceb56ec387be30391d84900bf1fd068 100644 (file)
--- a/src/cocoa/colour.mm
+++ b/src/cocoa/colour.mm
@@ -6,7 +6,7 @@
 // Created:     2003/06/17
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott
 // Created:     2003/06/17
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 David Elliott

-// Licence:    wxWindows licence
+// Licence:    wxWidgets licence

 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"
 /////////////////////////////////////////////////////////////////////////////
 
 #include "wx/wxprec.h"


@@ -22,10 +22,12 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 

-wxColour::wxColour ()
-:   m_cocoaNSColor(NULL)
+void wxColour::Init()

 {
 {

-    m_red = m_blue = m_green = 0;
+    m_cocoaNSColor = NULL;
+    m_red =
+    m_blue =
+    m_green = 0;

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


@@ -37,6 +39,12 @@ wxColour::wxColour (const wxColour& col)
     [m_cocoaNSColor retain];
 }
 
     [m_cocoaNSColor retain];
 }
 

+wxColour::wxColour( WX_NSColor aColor )
+:   m_cocoaNSColor(nil)
+{
+    Set(aColor);
+}
+

 wxColour& wxColour::operator =(const wxColour& col)
 {
     m_cocoaNSColor = col.m_cocoaNSColor;
 wxColour& wxColour::operator =(const wxColour& col)
 {
     m_cocoaNSColor = col.m_cocoaNSColor;


@@ -47,21 +55,20 @@ wxColour& wxColour::operator =(const wxColour& col)
     return *this;
 }
 
     return *this;
 }
 

-void wxColour::InitFromName(const wxString& col)
+void wxColour::InitFromName(const wxString& name)

 {
 {

-    wxColour *the_colour = wxTheColourDatabase->FindColour (col);
-    if (the_colour)
+    if ( wxTheColourDatabase )

     {
     {

-        *this = *the_colour;
-    }
-    else
-    {
-        [m_cocoaNSColor release];
-        m_cocoaNSColor = NULL;
-        m_red = 0;
-        m_green = 0;
-        m_blue = 0;
+        wxColour col = wxTheColourDatabase->Find(name);
+        if ( col.Ok() )
+        {
+            *this = col;
+            return;
+        }

     }
     }

+
+    // leave invalid
+    Init();

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


@@ -79,3 +86,18 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
     m_blue = b;
 }
 
     m_blue = b;
 }
 

+void wxColour::Set( WX_NSColor aColor )
+{
+    [aColor retain];
+    [m_cocoaNSColor release];
+    m_cocoaNSColor = aColor;
+
+    /* Make a temporary color in RGB format and get the values.  Note that
+       unless the color was actually RGB to begin with it's likely that
+       these will be fairly bogus. Particulary if the color is a pattern. */
+    NSColor *rgbColor = [m_cocoaNSColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
+    m_red = [rgbColor redComponent]*255.0;
+    m_green = [rgbColor greenComponent]*255.0;
+    m_blue = [rgbColor blueComponent]*255.0;
+}
+