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/tkMacOSXMenus.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/tkMacOSXMenus.c')
| -rw-r--r-- | macosx/tkMacOSXMenus.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c index cf28026..a24f880 100644 --- a/macosx/tkMacOSXMenus.c +++ b/macosx/tkMacOSXMenus.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: tkMacOSXMenus.c,v 1.4 2004/01/13 02:06:01 davygrvy Exp $ + * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.5 2004/04/01 18:33:30 wolfsuit Exp $ */ #include "tk.h" @@ -31,7 +31,6 @@ #define kSourceItem 1 #define kCloseItem 2 -#define kQuitItem 4 #define EDIT_CUT 1 #define EDIT_COPY 2 @@ -110,14 +109,6 @@ TkMacOSXHandleMenuSelect( tkwin = Tk_IdToWindow(dispPtr->display, window); TkGenWMDestroyEvent(tkwin); break; - case kQuitItem: - /* Exit */ - if (optionKeyPressed || gInterp == NULL) { - Tcl_Exit(0); - } else { - Tcl_Eval(gInterp, "exit"); - } - break; } break; case kEditMenu: @@ -189,8 +180,7 @@ TkMacOSXInitMenus( InsertMenu(tkFileMenu, 0); AppendMenu(tkFileMenu, "\pSourceÉ"); AppendMenu(tkFileMenu, "\pClose/W"); - AppendMenu(tkFileMenu, "\p(-"); - AppendMenu(tkFileMenu, "\pQuit/Q"); + if (TkMacOSXUseMenuID(kEditMenu) != TCL_OK) { Tcl_Panic("Menu ID %d is already in use!", kEditMenu); |