No real changes, just make wxWindow::CanScroll() virtual.

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

diff --git a/src/osx/cocoa/colour.mm b/src/osx/cocoa/colour.mm
index a59b71b2c0c785536179dd23dfd5b2ac52eadc4c..73df7fbf01f31b357e560716c443c8737459e8d5 100644 (file)
--- a/src/osx/cocoa/colour.mm
+++ b/src/osx/cocoa/colour.mm
@@ -4,7 +4,6 @@
 // Author:      Kevin Ollivier
 // Modified by:
 // Created:     2009-10-31
-// RCS-ID:      $Id: colour.cpp 61724 2009-08-21 10:41:26Z VZ $
 // Copyright:   (c) Kevin Ollivier
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -40,7 +39,7 @@ wxColour::wxColour(WX_NSColor col)
     InitFromComponents(components, noComp);
 }
 
-WX_NSColor wxColour::OSXGetNSColor()
+WX_NSColor wxColour::OSXGetNSColor() const
 {
-    return [NSColor colorWithDeviceRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0];
+    return [NSColor colorWithCalibratedRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0];
 }