diff options
| author | culler <culler> | 2019-04-17 14:05:33 (GMT) |
|---|---|---|
| committer | culler <culler> | 2019-04-17 14:05:33 (GMT) |
| commit | 7eaee2f2e59cbbb043964d94313d3f22a6d877a5 (patch) | |
| tree | 234a219579591d68652019df28397ade8a81a33e /macosx/tkMacOSXInit.c | |
| parent | 9b521b370e0520f6a489be15b65269a33761501a (diff) | |
| download | tk-7eaee2f2e59cbbb043964d94313d3f22a6d877a5.zip tk-7eaee2f2e59cbbb043964d94313d3f22a6d877a5.tar.gz tk-7eaee2f2e59cbbb043964d94313d3f22a6d877a5.tar.bz2 | |
Mitigate future merge conflict headaches.
Diffstat (limited to 'macosx/tkMacOSXInit.c')
| -rw-r--r-- | macosx/tkMacOSXInit.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index e1d56fa..e90e97b 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 { @@ -118,16 +118,15 @@ 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]; @@ -311,8 +310,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]; @@ -343,8 +342,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) { |