merging back XTI branch part 2

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

diff --git a/src/osx/cocoa/colour.mm b/src/osx/cocoa/colour.mm
index aebe52e1f35654e2850b98d393121685d24691a1..a59b71b2c0c785536179dd23dfd5b2ac52eadc4c 100644 (file)
--- a/src/osx/cocoa/colour.mm
+++ b/src/osx/cocoa/colour.mm
@@ -19,23 +19,28 @@
 
 #include "wx/osx/private.h"
 
-#if wxOSX_USE_COCOA
 wxColour::wxColour(WX_NSColor col)
 {
     size_t noComp = [col numberOfComponents];
-    
-    CGFloat *components = NULL;
-    if ( noComp >= 1 && noComp <= 4 )
+
+    CGFloat components[4];
+    CGFloat *p;
+    if ( noComp < 1 || noComp > WXSIZEOF(components) )
     {
         // TODO verify whether we really are on a RGB color space
         m_alpha = wxALPHA_OPAQUE;
         [col getComponents: components];
+        p = components;
+    }
+    else // Unsupported colour format.
+    {
+        p = NULL;
     }
-    InitFromComponents(const_cast<const CGFloat*>(components), noComp);
+
+    InitFromComponents(components, noComp);
 }
 
 WX_NSColor wxColour::OSXGetNSColor()
 {
-    return [NSColor colorWithDeviceRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0]; 
+    return [NSColor colorWithDeviceRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0];
 }
-#endif
\ No newline at end of file