mirror of
https://github.com/python/cpython.git
synced 2025-08-14 13:59:20 +00:00
fab9824658
Add upstream Tk patches for three problems affecting tkinter users:
- Update macOS installer to include a fix accepted by upstream Tcl/Tk
for a crash encountered after the first :meth:`tkinter.Tk` instance
is destroyed. (gh-92603)
- Update macOS installer to include an upstream Tcl/Tk fix
for the ``ttk::ThemeChanged`` error encountered in Tkinter. (gh-71383)
- Update macOS installer to include an upstream Tcl/Tk fix for the
``Secure coding is not enabled for restorable state!`` warning
encountered in Tkinter on macOS 14 Sonoma. (gh-110950)
(cherry picked from commit d67f947c72)
Co-authored-by: Christopher Chavez <chrischavez@gmx.us>
Co-authored-by: Ned Deily <nad@python.org>
82 lines
2.8 KiB
Diff
82 lines
2.8 KiB
Diff
Accepted upstream for release in Tk 8.6.14:
|
|
https://core.tcl-lang.org/tk/info/cf3830280b
|
|
|
|
--- tk8.6.13/macosx/tkMacOSXWindowEvent.c.orig
|
|
+++ tk8.6.13-patched/macosx/tkMacOSXWindowEvent.c
|
|
@@ -239,8 +239,8 @@ extern NSString *NSWindowDidOrderOffScreenNotification;
|
|
if (winPtr) {
|
|
TKContentView *view = [window contentView];
|
|
|
|
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101500
|
|
- if (@available(macOS 10.15, *)) {
|
|
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
|
|
+ if (@available(macOS 10.14, *)) {
|
|
[view viewDidChangeEffectiveAppearance];
|
|
}
|
|
#endif
|
|
@@ -1237,29 +1237,8 @@ static const char *const accentNames[] = {
|
|
} else if (effectiveAppearanceName == NSAppearanceNameDarkAqua) {
|
|
TkSendVirtualEvent(tkwin, "DarkAqua", NULL);
|
|
}
|
|
- if ([NSApp macOSVersion] < 101500) {
|
|
-
|
|
- /*
|
|
- * Mojave cannot handle the KVO shenanigans that we need for the
|
|
- * highlight and accent color notifications.
|
|
- */
|
|
-
|
|
- return;
|
|
- }
|
|
if (!defaultColor) {
|
|
defaultColor = [NSApp macOSVersion] < 110000 ? "Blue" : "Multicolor";
|
|
- preferences = [[NSUserDefaults standardUserDefaults] retain];
|
|
-
|
|
- /*
|
|
- * AppKit calls this method when the user changes the Accent Color
|
|
- * but not when the user changes the Highlight Color. So we register
|
|
- * to receive KVO notifications for Highlight Color as well.
|
|
- */
|
|
-
|
|
- [preferences addObserver:self
|
|
- forKeyPath:@"AppleHighlightColor"
|
|
- options:NSKeyValueObservingOptionNew
|
|
- context:NULL];
|
|
}
|
|
NSString *accent = [preferences stringForKey:@"AppleAccentColor"];
|
|
NSArray *words = [[preferences stringForKey:@"AppleHighlightColor"]
|
|
--- tk8.6.13/macosx/tkMacOSXWm.c.orig
|
|
+++ tk8.6.13-patched/macosx/tkMacOSXWm.c
|
|
@@ -1289,6 +1289,11 @@ TkWmDeadWindow(
|
|
[NSApp _setMainWindow:nil];
|
|
}
|
|
[deadNSWindow close];
|
|
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
|
|
+ NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
|
|
+ [preferences removeObserver:deadNSWindow.contentView
|
|
+ forKeyPath:@"AppleHighlightColor"];
|
|
+#endif
|
|
[deadNSWindow release];
|
|
|
|
#if DEBUG_ZOMBIES > 1
|
|
@@ -6763,6 +6768,21 @@ TkMacOSXMakeRealWindowExist(
|
|
}
|
|
TKContentView *contentView = [[TKContentView alloc]
|
|
initWithFrame:NSZeroRect];
|
|
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101400
|
|
+ NSUserDefaults *preferences = [NSUserDefaults standardUserDefaults];
|
|
+
|
|
+ /*
|
|
+ * AppKit calls the viewDidChangeEffectiveAppearance method when the
|
|
+ * user changes the Accent Color but not when the user changes the
|
|
+ * Highlight Color. So we register to receive KVO notifications for
|
|
+ * Highlight Color as well.
|
|
+ */
|
|
+
|
|
+ [preferences addObserver:contentView
|
|
+ forKeyPath:@"AppleHighlightColor"
|
|
+ options:NSKeyValueObservingOptionNew
|
|
+ context:NULL];
|
|
+#endif
|
|
[window setContentView:contentView];
|
|
[contentView release];
|
|
[window setDelegate:NSApp];
|