diff options
| author | culler <culler> | 2020-06-25 21:12:33 (GMT) |
|---|---|---|
| committer | culler <culler> | 2020-06-25 21:12:33 (GMT) |
| commit | 89f5a6802f0e3aa56d0f612913683dc432646bd0 (patch) | |
| tree | 3b069fa04d7791d8c0a83a4c2b35d2719a2d4fd0 /macosx/tkMacOSXColor.c | |
| parent | dc7625ccd3a00dba6a55b37c190b2cae3b58ea4f (diff) | |
| download | tk-89f5a6802f0e3aa56d0f612913683dc432646bd0.zip tk-89f5a6802f0e3aa56d0f612913683dc432646bd0.tar.gz tk-89f5a6802f0e3aa56d0f612913683dc432646bd0.tar.bz2 | |
Aqua: replace [NSApp macMinorVersion] by [NSApp macOSVersion] event though the Big Sur (11.1) beta release identifies itself as 10.16.
Diffstat (limited to 'macosx/tkMacOSXColor.c')
| -rw-r--r-- | macosx/tkMacOSXColor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/macosx/tkMacOSXColor.c b/macosx/tkMacOSXColor.c index 7694b1d..5b59b58 100644 --- a/macosx/tkMacOSXColor.c +++ b/macosx/tkMacOSXColor.c @@ -308,7 +308,7 @@ SetCGColorComponents( * windowBackGroundColor. */ - if ([NSApp macMinorVersion] < 14) { + if ([NSApp macOSVersion] < 101400) { for (int i=0; i<3; i++) { rgba[i] = windowBackground[i]; } @@ -335,7 +335,7 @@ SetCGColorComponents( color = [[NSColor selectedTextColor] colorUsingColorSpace:sRGB]; break; case 2: - if ([NSApp macMinorVersion] > 9) { + if ([NSApp macOSVersion] > 100900) { #if MAC_OS_X_VERSION_MAX_ALLOWED > 1090 color = [[NSColor labelColor] colorUsingColorSpace:sRGB]; #endif @@ -351,7 +351,7 @@ SetCGColorComponents( colorUsingColorSpace:sRGB]; break; case 5: - if ([NSApp macMinorVersion] > 6) { + if ([NSApp macOSVersion] > 100600) { color = [[NSColor whiteColor] colorUsingColorSpace:sRGB]; } else { color = [[NSColor blackColor] colorUsingColorSpace:sRGB]; @@ -378,7 +378,7 @@ SetCGColorComponents( } break; case 9: - if ([NSApp macMinorVersion] >= 10) { + if ([NSApp macOSVersion] >= 101000) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 color = [[NSColor linkColor] colorUsingColorSpace:sRGB]; #endif @@ -387,7 +387,7 @@ SetCGColorComponents( } break; default: - if ([NSApp macMinorVersion] >= 10) { + if ([NSApp macOSVersion] >= 101000) { #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 color = [[NSColor labelColor] colorUsingColorSpace:sRGB]; #endif @@ -442,7 +442,7 @@ TkMacOSXInDarkMode(Tk_Window tkwin) #if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400 static NSAppearanceName darkAqua = @"NSAppearanceNameDarkAqua"; - if ([NSApp macMinorVersion] >= 14) { + if ([NSApp macOSVersion] >= 101400) { TkWindow *winPtr = (TkWindow*) tkwin; NSView *view = nil; if (winPtr && winPtr->privatePtr) { |