diff options
| author | das <das> | 2003-05-13 02:42:57 (GMT) |
|---|---|---|
| committer | das <das> | 2003-05-13 02:42:57 (GMT) |
| commit | da1bf4fb459b1e4f5e1be8a76e14029d4a9d331b (patch) | |
| tree | dedfb9313098f6f370b756eefb7f3817c98756c5 /macosx/tkMacOSXHLEvents.c | |
| parent | 996aa5aa5d6fca18e46c0f25c7f25589a1d85003 (diff) | |
| download | tk-da1bf4fb459b1e4f5e1be8a76e14029d4a9d331b.zip tk-da1bf4fb459b1e4f5e1be8a76e14029d4a9d331b.tar.gz tk-da1bf4fb459b1e4f5e1be8a76e14029d4a9d331b.tar.bz2 | |
backport of Mac OS X specific changes on trunk since 8.4.2:
* macosx/tkMacOSXClipboard.c (TkSelGetSelection): Convert
'\r' to '\n' on the way into Tcl. (ingham)
* 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. (ingham)
* 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. (ingham)
* macosx/tkMacOSXApplication.r (removed):
* macosx/tkMacOSXLibrary.r (removed):
* macosx/tkMacOSXResource.r (removed):
* macosx/Wish.pbproj/project.pbxproj:
* macosx/tkAboutDlg.r: updated copyrights, cleaned up about box,
removed obsolete unused resource files. (steffen)
Diffstat (limited to 'macosx/tkMacOSXHLEvents.c')
| -rw-r--r-- | macosx/tkMacOSXHLEvents.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c index 65b0b6c..ac167f2 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.5.2.1 2003/05/13 02:42:57 das 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; } |