diff options
| author | das <das> | 2004-11-11 01:26:40 (GMT) |
|---|---|---|
| committer | das <das> | 2004-11-11 01:26:40 (GMT) |
| commit | ce94eed8e3c51494a411e1389946fabf9923ff43 (patch) | |
| tree | f24f480319309f3272f2b41ab1563f81c89ae1fc /macosx/tkMacOSXMenus.c | |
| parent | f4d485d83668861b7724e5349c8b5c3d4f70e28c (diff) | |
| download | tk-ce94eed8e3c51494a411e1389946fabf9923ff43.zip tk-ce94eed8e3c51494a411e1389946fabf9923ff43.tar.gz tk-ce94eed8e3c51494a411e1389946fabf9923ff43.tar.bz2 | |
* generic/tkMain.c:
* macosx/tkMacOSXAppInit.c (removed):
* macosx/Wish.pbproj/project.pbxproj:
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXInt.h: changes to make TkAqua dynamically loadable,
enabling [package require Tk] from tclsh. Startup code from
tkMacOSXAppInit.c moved into tkMacOSXInit.c, added code that
notifies the window server that an unbundled executable is a full
GUI application after loading Tk. [Patch 1035348]
* doc/wm.n: documented [wm attributes] on Mac OS X. [Bug 606665]
* macosx/tkMacOSXWm.c: implemented TIP 222 [wm attributes -alpha] on
Mac OS X. [Patch 892194]
WmIconbitmapCmd: adopted FSRef changes from [wm atttrs -titlepath].
* macosx/tkMacOSXButton.c:
* macosx/tkMacOSXMenus.c:
* macosx/tkMacOSXRegion.c:
* macosx/tkMacOSXSubwindows.c: synced spacing/formatting with HEAD.
* macosx/tkMacOSXMouseEvent.c: endianness fixes.
* macosx/Wish.pbproj/project.pbxproj: corrected path to html help
inside framework.
* macosx/Makefile: prevent parallel make from building several
targets at the same time.
Ensure that xcodebuild will use Wish.pbproj project even if a .xcode
project is also present.
Diffstat (limited to 'macosx/tkMacOSXMenus.c')
| -rw-r--r-- | macosx/tkMacOSXMenus.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c index 892ef8a..b1aebe8 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.2.2.2 2004/03/17 19:01:47 wolfsuit Exp $ + * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.2.2.3 2004/11/11 01:26:43 das 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: @@ -190,14 +181,7 @@ TkMacOSXInitMenus( AppendMenu(tkFileMenu, "\pSourceÉ"); AppendMenu(tkFileMenu, "\pClose/W"); - /* - * These don't belong in the File menu on Mac OS X. - */ - -#if 0 - AppendMenu(tkFileMenu, "\p(-"); - AppendMenu(tkFileMenu, "\pQuit/Q"); -#endif + if (TkMacOSXUseMenuID(kEditMenu) != TCL_OK) { panic("Menu ID %d is already in use!", kEditMenu); } |