diff options
| author | wolfsuit <wolfsuit> | 2004-04-01 18:33:29 (GMT) |
|---|---|---|
| committer | wolfsuit <wolfsuit> | 2004-04-01 18:33:29 (GMT) |
| commit | 70074e3ac26b510594d84e1200f827db34a75089 (patch) | |
| tree | 1d90d3f2090d5341ddc0c5d009b3cbb4f1b530ef /macosx/tkMacOSXMenu.c | |
| parent | 6320df04ec1f7454632285dcfc34f22a38122b0f (diff) | |
| download | tk-70074e3ac26b510594d84e1200f827db34a75089.zip tk-70074e3ac26b510594d84e1200f827db34a75089.tar.gz tk-70074e3ac26b510594d84e1200f827db34a75089.tar.bz2 | |
Fixes for bugs 220871 and 917557. Plus remove the Quit menu from the default
File menu.
Diffstat (limited to 'macosx/tkMacOSXMenu.c')
| -rw-r--r-- | macosx/tkMacOSXMenu.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index 0885e40..4521754 100644 --- a/macosx/tkMacOSXMenu.c +++ b/macosx/tkMacOSXMenu.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.12 2004/02/16 00:19:42 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.13 2004/04/01 18:33:30 wolfsuit Exp $ */ #include "tkMacOSXInt.h" #include "tkMenuButton.h" @@ -2099,11 +2099,18 @@ EventuallyInvokeMenu (ClientData data) { struct MenuCommandHandlerData *realData = (struct MenuCommandHandlerData *) data; + int code; + code = TkInvokeMenu(realData->menuPtr->interp, realData->menuPtr, + realData->index); + if (code != TCL_OK && code != TCL_CONTINUE + && code != TCL_BREAK) { + Tcl_AddErrorInfo(realData->menuPtr->interp, "\n (menu invoke)"); + Tcl_BackgroundError(realData->menuPtr->interp); + } + Tcl_Release(realData->menuPtr->interp); Tcl_Release(realData->menuPtr); - TkInvokeMenu(realData->menuPtr->interp, realData->menuPtr, - realData->index); } /* |