diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2015-12-07 02:02:44 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2015-12-07 02:02:44 (GMT) |
| commit | 6aad9c9b454d5334c3e36cd2bf623dae8369defe (patch) | |
| tree | 740de6d2fe3af13e22213ec4ef7e027a3d1d93ee /macosx/tkMacOSXXStubs.c | |
| parent | 3c354d91432f5a951efb12e957299cacdeafb897 (diff) | |
| download | tk-6aad9c9b454d5334c3e36cd2bf623dae8369defe.zip tk-6aad9c9b454d5334c3e36cd2bf623dae8369defe.tar.gz tk-6aad9c9b454d5334c3e36cd2bf623dae8369defe.tar.bz2 | |
Fix for zombie windows on El Capitan/OS X 10.11; thanks to Marc Culler for patch
Diffstat (limited to 'macosx/tkMacOSXXStubs.c')
| -rw-r--r-- | macosx/tkMacOSXXStubs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/macosx/tkMacOSXXStubs.c b/macosx/tkMacOSXXStubs.c index e87bb39..c39d42d 100644 --- a/macosx/tkMacOSXXStubs.c +++ b/macosx/tkMacOSXXStubs.c @@ -142,7 +142,7 @@ TkpOpenDisplay( static NSRect maxBounds = {{0, 0}, {0, 0}}; static char vendor[25] = ""; NSArray *cgVers; - NSAutoreleasePool *pool; + if (gMacDisplay != NULL) { if (strcmp(gMacDisplay->display->display_name, display_name) == 0) { @@ -152,6 +152,8 @@ TkpOpenDisplay( } } + NSAutoreleasePool *pool = [NSAutoreleasePool new]; + display = ckalloc(sizeof(Display)); screen = ckalloc(sizeof(Screen)); bzero(display, sizeof(Display)); @@ -166,7 +168,6 @@ TkpOpenDisplay( display->default_screen = 0; display->display_name = (char *) macScreenName; - pool = [NSAutoreleasePool new]; cgVers = [[[NSBundle bundleWithIdentifier:@"com.apple.CoreGraphics"] objectForInfoDictionaryKey:@"CFBundleShortVersionString"] componentsSeparatedByString:@"."]; @@ -184,7 +185,7 @@ TkpOpenDisplay( { int major, minor, patch; -#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080 +#if MAC_OS_X_VERSION_MIN_REQUIRED < 10100 Gestalt(gestaltSystemVersionMajor, (SInt32*)&major); Gestalt(gestaltSystemVersionMinor, (SInt32*)&minor); Gestalt(gestaltSystemVersionBugFix, (SInt32*)&patch); |