summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-17 06:35:41 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-08-17 06:35:41 (GMT)
commitbf7475f9e1b78233c97014dcdb7a1c11c34ea4d9 (patch)
treeea8ae57d5d889482379938c316bf6b840be7712e
parent3429267f021764f4911937b03becd9acf6109cf4 (diff)
parent3d9d9c5309da06693a010b3936c6be0aa9e33599 (diff)
downloadtk-bf7475f9e1b78233c97014dcdb7a1c11c34ea4d9.zip
tk-bf7475f9e1b78233c97014dcdb7a1c11c34ea4d9.tar.gz
tk-bf7475f9e1b78233c97014dcdb7a1c11c34ea4d9.tar.bz2
Merge 8.6
-rw-r--r--macosx/tkMacOSXWindowEvent.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index d92ab75..d582d75 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -1093,7 +1093,7 @@ ConfigureRestrictProc(
#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
-static char *accentNames[] = {
+static const char *const accentNames[] = {
"Graphite",
"Red",
"Orange",
@@ -1101,7 +1101,7 @@ static char *accentNames[] = {
"Green",
"Blue",
"Purple",
- "Pink",
+ "Pink"
};
- (void) viewDidChangeEffectiveAppearance
@@ -1117,7 +1117,7 @@ static char *accentNames[] = {
NSString *highlight = [[[preferences stringForKey:@"AppleHighlightColor"]
componentsSeparatedByString: @" "]
objectAtIndex:3];
- static char *defaultColor = NULL;
+ static const char *defaultColor = NULL;
if (!defaultColor) {
defaultColor = [NSApp macOSVersion] < 110000 ? "Blue" : "Multicolor";