diff options
Diffstat (limited to 'macosx/tkMacOSXInit.c')
| -rw-r--r-- | macosx/tkMacOSXInit.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index d61fddf..3951f07 100644 --- a/macosx/tkMacOSXInit.c +++ b/macosx/tkMacOSXInit.c @@ -45,7 +45,7 @@ static char scriptPath[PATH_MAX + 1] = ""; @implementation TKApplication(TKInit) - (void) _resetAutoreleasePool { - if([self poolLock] == 0) { + if ([self poolLock] == 0) { [_mainPool drain]; _mainPool = [NSAutoreleasePool new]; } else { @@ -102,7 +102,6 @@ static char scriptPath[PATH_MAX + 1] = ""; _defaultMainMenu = nil; [self _setupMenus]; - /* * Initialize event processing. */ @@ -118,18 +117,17 @@ static char scriptPath[PATH_MAX + 1] = ""; -(void)applicationDidFinishLaunching:(NSNotification *)notification { /* - * 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. + * 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. */ [NSApp activateIgnoringOtherApps: YES]; /* - * Process events to ensure that the root window is fully - * initialized. See ticket 56a1823c73. + * Process events to ensure that the root window is fully initialized. See + * ticket 56a1823c73. */ - + [NSApp _lockAutoreleasePool]; while (Tcl_DoOneEvent(TCL_WINDOW_EVENTS| TCL_DONT_WAIT)) {} [NSApp _unlockAutoreleasePool]; @@ -154,7 +152,7 @@ static char scriptPath[PATH_MAX + 1] = ""; * Record the OS version we are running on. */ int minorVersion; -#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000 +#if MAC_OS_X_VERSION_MAX_ALLOWED < 101000 Gestalt(gestaltSystemVersionMinor, (SInt32*)&minorVersion); #else NSOperatingSystemVersion systemVersion; @@ -313,8 +311,8 @@ TkpInit( } /* - * Instantiate our NSApplication object. This needs to be - * done before we check whether to open a console window. + * Instantiate our NSApplication object. This needs to be done before + * we check whether to open a console window. */ NSAutoreleasePool *pool = [NSAutoreleasePool new]; @@ -345,8 +343,8 @@ TkpInit( Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDERR)); /* - * Only show the console if we don't have a startup script - * and tcl_interactive hasn't been set already. + * Only show the console if we don't have a startup script and + * tcl_interactive hasn't been set already. */ if (Tcl_GetStartupScript(NULL) == NULL) { |