Don't call StartingKey if the key was F2

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

diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm
index dd7fd3e73c8005d78d217a82f2073187668094a6..b191ab9a967cf871b3087adb817640a5c7f9ad74 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"


@@ -39,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;


@@ -80,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      = (wxUint8) ([rgbColor redComponent]   * 255.0);
+    m_green = (wxUint8) ([rgbColor greenComponent] * 255.0);
+    m_blue     = (wxUint8) ([rgbColor blueComponent]  * 255.0);
+}
+