summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXHLEvents.c
diff options
context:
space:
mode:
authorwolfsuit <wolfsuit>2003-03-12 05:56:21 (GMT)
committerwolfsuit <wolfsuit>2003-03-12 05:56:21 (GMT)
commit413da068905437f950c4f16ac5f0c699724fb5b4 (patch)
treeb00a57fe2641e2716944ca46b11e7191cef01b97 /macosx/tkMacOSXHLEvents.c
parent50813805a9b54deccdeee4e0dc5f0dca3ac730c1 (diff)
downloadtk-413da068905437f950c4f16ac5f0c699724fb5b4.zip
tk-413da068905437f950c4f16ac5f0c699724fb5b4.tar.gz
tk-413da068905437f950c4f16ac5f0c699724fb5b4.tar.bz2
2003-03-11 Jim Ingham <jingham@apple.com>
* macosx/tkMacOSXMenu.c (EventuallyInvokeMenu): New function, used to invoke menu commands at idle time. (TkMacOSXDispatchMenuEvent): Don't immediately dispatch menu commands, wait till the idle loop to do so. This is more like what is done on Windows, and avoids the crash from destroying a menu in it's command. * macosx/tkMacOSXHLEvents.c (ReallyKillMe): Don't force the shell to exit. According to the OS X HI guidelines, it should be possible to cancel an attempt to quit, and if we force the kill, here, it would not be possible to implement this.
Diffstat (limited to 'macosx/tkMacOSXHLEvents.c')
-rw-r--r--macosx/tkMacOSXHLEvents.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index 65b0b6c..90821c7 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXHLEvents.c,v 1.5 2003/02/25 16:11:22 das Exp $
+ * RCS: @(#) $Id: tkMacOSXHLEvents.c,v 1.6 2003/03/12 05:56:21 wolfsuit Exp $
*/
#include "tkMacOSXPort.h"
@@ -404,13 +404,11 @@ ScriptHandler (const AppleEvent * event, AppleEvent * reply, long handlerRefcon)
*
* ReallyKillMe --
*
- * This proc tries to kill the shell by running exit, and if that
- * has not succeeded (e.g. because someone has renamed the exit
- * command), calls Tcl_Exit to really kill the shell. Called from
- * an event scheduled by the "Quit" AppleEvent handler.
+ * This proc tries to kill the shell by running exit,
+ * called from an event scheduled by the "Quit" AppleEvent handler.
*
* Results:
- * Kills the shell.
+ * Runs the "exit" command which might kill the shell.
*
* Side effects:
* None.
@@ -425,7 +423,6 @@ ReallyKillMe(Tcl_Event *eventPtr, int flags)
if (interp != NULL) {
Tcl_GlobalEval(interp, "exit");
}
- Tcl_Exit(0);
return 1;
}