From 0b69ba6459d879f4537c7d96cab695b95a7c3450 Mon Sep 17 00:00:00 2001
From: Daniel Kulp <dan@kulp.com>
Date: Sat, 1 Sep 2018 01:29:11 -0400
Subject: [PATCH] Set the appearance when working with wxColour components
 (#910)

---
 src/osx/cocoa/colour.mm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/osx/cocoa/colour.mm b/src/osx/cocoa/colour.mm
index 065c9547ae..d7fc6ec81d 100644
--- a/src/osx/cocoa/colour.mm
+++ b/src/osx/cocoa/colour.mm
@@ -60,6 +60,7 @@ WX_NSColor wxNSColorRefData::GetNSColor() const
 
 CGFloat wxNSColorRefData::Red() const
 {
+    wxOSXEffectiveAppearanceSetter helper;
     if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
         return [colRGBA redComponent];
     
@@ -68,6 +69,7 @@ CGFloat wxNSColorRefData::Red() const
 
 CGFloat wxNSColorRefData::Green() const
 {
+    wxOSXEffectiveAppearanceSetter helper;
     if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
         return [colRGBA greenComponent];
     
@@ -76,6 +78,7 @@ CGFloat wxNSColorRefData::Green() const
 
 CGFloat wxNSColorRefData::Blue() const
 {
+    wxOSXEffectiveAppearanceSetter helper;
     if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
         return [colRGBA blueComponent];
     
@@ -84,6 +87,7 @@ CGFloat wxNSColorRefData::Blue() const
 
 CGFloat wxNSColorRefData::Alpha() const
 {
+    wxOSXEffectiveAppearanceSetter helper;
     if ( NSColor* colRGBA = [m_nsColour colorUsingColorSpaceName:NSCalibratedRGBColorSpace] )
         return [colRGBA alphaComponent];
     
@@ -93,8 +97,10 @@ CGFloat wxNSColorRefData::Alpha() const
 CGColorRef wxNSColorRefData::GetCGColor() const
 {
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
-    if (wxPlatformInfo::Get().CheckOSVersion(10, 8))
+    if (wxPlatformInfo::Get().CheckOSVersion(10, 8)) {
+        wxOSXEffectiveAppearanceSetter helper;
         return [m_nsColour CGColor];
+    }
 #endif
     CGColorRef cgcolor = NULL;
 
@@ -174,6 +180,7 @@ CGColorRef wxNSColorRefData::GetCGColor() const
 
 WX_NSColor wxColourRefData::GetNSColor() const
 {
+    wxOSXEffectiveAppearanceSetter helper;
     return [NSColor colorWithCalibratedRed:Red() green:Green() blue:Blue() alpha:Alpha() ];
 }