Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No real changes, just make wxColour::OSXGetNSColor() const.

Browse Source 
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
This commit is contained in:
Vadim Zeitlin
2011-02-27 12:48:42 +00:00
parent 2814e718ba
commit 83586c2aae
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/osx/core/colour.h
View File

@@ -60,7 +60,7 @@ public:
#endif #endif
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
wxColour(WX_NSColor color); wxColour(WX_NSColor color);
WX_NSColor OSXGetNSColor(); WX_NSColor OSXGetNSColor() const;
#endif #endif
wxColour& operator=(CGColorRef col); wxColour& operator=(CGColorRef col);
wxColour& operator=(const wxColour& col); wxColour& operator=(const wxColour& col);

2
src/osx/cocoa/colour.mm
View File

@@ -40,7 +40,7 @@ wxColour::wxColour(WX_NSColor col)
InitFromComponents(components, noComp); 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 colorWithDeviceRed:m_red / 255.0 green:m_green / 255.0 blue:m_blue / 255.0 alpha:m_alpha / 255.0];
} }