diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-17 14:50:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-17 14:50:23 (GMT) |
| commit | 08f5935d05a1685e01aee43a12413aff89a70e6a (patch) | |
| tree | d8f650899402970eb68a62c1fb2360ad0a554bb2 /macosx | |
| parent | c0f14624f3cdc85d8331b9890f1e4272911f25dc (diff) | |
| parent | da123e1d6589638db605eee2dbf801027215e7ad (diff) | |
| download | tk-08f5935d05a1685e01aee43a12413aff89a70e6a.zip tk-08f5935d05a1685e01aee43a12413aff89a70e6a.tar.gz tk-08f5935d05a1685e01aee43a12413aff89a70e6a.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXDebug.c | 2 | ||||
| -rw-r--r-- | macosx/tkMacOSXInit.c | 16 |
2 files changed, 5 insertions, 13 deletions
diff --git a/macosx/tkMacOSXDebug.c b/macosx/tkMacOSXDebug.c index 78008f0..fc01ef4 100644 --- a/macosx/tkMacOSXDebug.c +++ b/macosx/tkMacOSXDebug.c @@ -64,7 +64,7 @@ TkMacOSXGetNamedDebugSymbol( for (i = 0; i < n; i++) { if (module && *module) { /* Find image with given module name */ - char *name; + const char *name; const char *path = _dyld_get_image_name(i); if (!path) { diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index e3ea481..551577e 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -120,14 +120,12 @@ static char scriptPath[PATH_MAX + 1] = ""; * It is not safe to force activation of the NSApp until this method is * called. Activating too early can cause the menu bar to be unresponsive. * The call to activateIgnoringOtherApps was moved here to avoid this. - * However, with the release of macOS 10.15 (Catalina) this was no longer - * sufficient. (See ticket bf93d098d7.) Apparently apps were being - * activated automatically, and this was sometimes being done too early. - * As a workaround we deactivate and then reactivate the app, even though - * Apple says that "Normally, you shouldn’t invoke this method". + * However, with the release of macOS 10.15 (Catalina) that was no longer + * sufficient. (See ticket bf93d098d7.) The call to setActivationPolicy + * needed to be moved into this function as well. */ - [NSApp deactivate]; + [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; [NSApp activateIgnoringOtherApps: YES]; /* @@ -179,12 +177,6 @@ static char scriptPath[PATH_MAX + 1] = ""; [self setDelegate:self]; /* - * Make sure we are allowed to open windows. - */ - - [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; - - /* * If no icon has been set from an Info.plist file, use the Wish icon from * the Tk framework. */ |