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

diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h
index cdb0f83a2c80b8fba3954311d5de2d2fd128be76..f5357bcb709a77df2bb006d88224e96a98a3ce78 100644 (file)
--- 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 a59b71b2c0c785536179dd23dfd5b2ac52eadc4c..331022932f6cdb1ebd7397d67456ec3a8d906dd8 100644 (file)
--- 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];
 }