diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-17 06:41:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-17 06:41:28 (GMT) |
| commit | e36992b8a82f14994535a4c00ad5fd3b6a2845ad (patch) | |
| tree | 4a25792652856062d67d4f5321caa421f352af38 /macosx/tkMacOSXWindowEvent.c | |
| parent | 560a6b03e7e93607af6c0748938e380f86938b2a (diff) | |
| parent | bf7475f9e1b78233c97014dcdb7a1c11c34ea4d9 (diff) | |
| download | tk-e36992b8a82f14994535a4c00ad5fd3b6a2845ad.zip tk-e36992b8a82f14994535a4c00ad5fd3b6a2845ad.tar.gz tk-e36992b8a82f14994535a4c00ad5fd3b6a2845ad.tar.bz2 | |
Merge trunk
Diffstat (limited to 'macosx/tkMacOSXWindowEvent.c')
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index d92ab75..cd9fde2 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"; @@ -1140,11 +1140,11 @@ static char *accentNames[] = { snprintf(data, 256, "Appearance %s Accent %s Highlight %s", effectiveAppearanceName.UTF8String, accentName, highlightName); - TkSendVirtualEvent(tkwin, "AppearanceChanged", Tcl_NewStringObj(data, -1)); + Tk_SendVirtualEvent(tkwin, "AppearanceChanged", Tcl_NewStringObj(data, -1)); if (effectiveAppearanceName == NSAppearanceNameAqua) { - TkSendVirtualEvent(tkwin, "LightAqua", NULL); + Tk_SendVirtualEvent(tkwin, "LightAqua", NULL); } else if (effectiveAppearanceName == NSAppearanceNameDarkAqua) { - TkSendVirtualEvent(tkwin, "DarkAqua", NULL); + Tk_SendVirtualEvent(tkwin, "DarkAqua", NULL); } } |