wxColour -> NSColor conversion.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62530 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h
index 388b176f2a70b7b7bc9b9658e2194cf83527e71e..bbc72012221ed50a852b686d29fbad63ce9c87b2 100644 (file)
--- a/include/wx/osx/core/colour.h
+++ b/include/wx/osx/core/colour.h
@@ -60,6 +60,7 @@ public:
 #endif
 #if wxOSX_USE_COCOA
     wxColour(WX_NSColor color);
+    WX_NSColor OSXGetNSColor();
 #endif
     wxColour& operator=(CGColorRef col);
     wxColour& operator=(const wxColour& col);

diff --git a/src/osx/cocoa/colour.mm b/src/osx/cocoa/colour.mm
index ffce54a7943ab690ec7f7ad189069f2c175470ff..aebe52e1f35654e2850b98d393121685d24691a1 100644 (file)
--- a/src/osx/cocoa/colour.mm
+++ b/src/osx/cocoa/colour.mm
@@ -33,4 +33,9 @@ wxColour::wxColour(WX_NSColor col)
     }
     InitFromComponents(const_cast<const CGFloat*>(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]; 
+}
 #endif
\ No newline at end of file