forked from python/cpython
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pythongh-92603: add upstream fix to macOS installer
- Loading branch information
1 parent
add8d45
commit d70fcb1
Showing
3 changed files
with
86 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
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) { | ||
Tk_SendVirtualEvent(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]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
Misc/NEWS.d/next/macOS/2023-08-30-16-33-57.gh-issue-92603.ATkKVO.rst
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
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. |