From 83586c2aaec7a1045a0bb146a413bdd7f3581db0 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 27 Feb 2011 12:48:42 +0000 Subject: [PATCH] No real changes, just make wxColour::OSXGetNSColor() const. There is no reason to not allow calling this method on const wxColour objects. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/osx/core/colour.h | 2 +- src/osx/cocoa/colour.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h index cdb0f83a2c..f5357bcb70 100644 --- a/include/wx/osx/core/colour.h +++ b/include/wx/osx/core/colour.h @@ -60,7 +60,7 @@ public: #endif #if wxOSX_USE_COCOA wxColour(WX_NSColor color); - WX_NSColor OSXGetNSColor(); + WX_NSColor OSXGetNSColor() const; #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 a59b71b2c0..331022932f 100644 --- a/src/osx/cocoa/colour.mm +++ b/src/osx/cocoa/colour.mm @@ -40,7 +40,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]; } -- 2.45.2