Review branch for merge of Tk-Cocoa into Tk 8.5 main branch

1 files changed, 343 insertions, 269 deletions

diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index 2b5126c..e9f275e 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -1,45 +1,242 @@
 /*
  * tkMacOSXMenus.c --
  *
- *	These calls set up and manage the menubar for the
- *	Macintosh version of Tk.
+ *	These calls set up the default menus for Tk.
  *
  * Copyright (c) 1995-1996 Sun Microsystems, Inc.
- * Copyright 2001, Apple Computer, Inc.
- * Copyright (c) 2005-2007 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright 2001-2009, Apple Inc.
+ * Copyright (c) 2005-2009 Daniel A. Steffen <das@users.sourceforge.net>
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * RCS: @(#) $Id$
  */
 
 #include "tkMacOSXPrivate.h"
+#include "tkMenu.h"
+
+static void		GenerateEditEvent(const char *name);
+static Tcl_Obj *	GetWidgetDemoPath(Tcl_Interp *interp);
 
-#define kAppleMenu		256
-#define kAppleAboutItem		1
-#define kFileMenu		2
-#define kEditMenu		3
+#pragma mark TKApplication(TKMenus)
 
-#define kSourceItem		1
-#define kDemoItem		2
-#define kCloseItem		3
+@implementation TKApplication(TKMenus)
+- (void)_setupMenus {
+    if (_defaultMainMenu) {
+	return;
+    }
+    TkMenuInit();
+    NSString *applicationName = [[NSBundle mainBundle]
+	    objectForInfoDictionaryKey:@"CFBundleName"];
+    if (!applicationName) {
+	applicationName = [[NSProcessInfo processInfo] processName];
+    }
+    NSString *aboutName = (applicationName &&
+	    ![applicationName isEqualToString:@"Wish"] &&
+	    ![applicationName hasPrefix:@"tclsh"]) ?
+	    applicationName : @"Tcl & Tk";
+    _servicesMenu = [NSMenu menuWithTitle:@"Services"];
+    _defaultApplicationMenuItems = [[NSArray arrayWithObjects:
+	    [NSMenuItem separatorItem],
+	    [NSMenuItem itemWithTitle:
+		   [NSString stringWithFormat:@"Preferences%C", 0x2026]
+		   action:@selector(preferences:) keyEquivalent:@","],
+	    [NSMenuItem separatorItem],
+	    [NSMenuItem itemWithTitle:@"Services" submenu:_servicesMenu],
+	    [NSMenuItem separatorItem],
+	    [NSMenuItem itemWithTitle:
+		   [NSString stringWithFormat:@"Hide %@", applicationName]
+		   action:@selector(hide:) keyEquivalent:@"h"],
+	    [NSMenuItem itemWithTitle:@"Hide Others"
+		   action:@selector(hideOtherApplications:) keyEquivalent:@"h"
+		   keyEquivalentModifierMask:
+		   NSCommandKeyMask|NSAlternateKeyMask],
+	    [NSMenuItem itemWithTitle:@"Show All"
+		   action:@selector(unhideAllApplications:)],
+	    [NSMenuItem separatorItem],
+	    [NSMenuItem itemWithTitle:
+		   [NSString stringWithFormat:@"Quit %@", applicationName]
+		   action: @selector(terminate:) keyEquivalent:@"q"],
+	    nil] retain];
+    _defaultApplicationMenu = [TKMenu menuWithTitle:applicationName
+	    menuItems:_defaultApplicationMenuItems];
+    [_defaultApplicationMenu insertItem:
+	    [NSMenuItem itemWithTitle:
+		    [NSString stringWithFormat:@"About %@", aboutName]
+		    action:@selector(orderFrontStandardAboutPanel:)] atIndex:0];
+    TKMenu *fileMenu = [TKMenu menuWithTitle:@"File" menuItems:
+	    [NSArray arrayWithObjects:
+	    [NSMenuItem itemWithTitle:
+		   [NSString stringWithFormat:@"Source%C", 0x2026]
+		   action:@selector(tkSource:)],
+	    [NSMenuItem itemWithTitle:@"Run Widget Demo"
+		   action:@selector(tkDemo:)],
+	    [NSMenuItem itemWithTitle:@"Close" action:@selector(performClose:)
+		   target:nil keyEquivalent:@"w"],
+	    nil]];
+    TKMenu *editMenu = [TKMenu menuWithTitle:@"Edit" menuItems:
+	    [NSArray arrayWithObjects:
+	    [NSMenuItem itemWithTitle:@"Undo" action:@selector(undo:)
+		   target:nil keyEquivalent:@"z"],
+	    [NSMenuItem itemWithTitle:@"Redo" action:@selector(redo:)
+		   target:nil keyEquivalent:@"y"],
+	    [NSMenuItem separatorItem],
+	    [NSMenuItem itemWithTitle:@"Cut" action:@selector(cut:)
+		   target:nil keyEquivalent:@"x"],
+	    [NSMenuItem itemWithTitle:@"Copy" action:@selector(copy:)
+		   target:nil keyEquivalent:@"c"],
+	    [NSMenuItem itemWithTitle:@"Paste" action:@selector(paste:)
+		   target:nil keyEquivalent:@"v"],
+	    [NSMenuItem itemWithTitle:@"Delete" action:@selector(delete:)
+		   target:nil],
+	    nil]];
+    _defaultWindowsMenuItems = [[NSArray arrayWithObjects:
+	    [NSMenuItem itemWithTitle:@"Minimize"
+		   action:@selector(performMiniaturize:) target:nil
+		   keyEquivalent:@"m"],
+	    [NSMenuItem itemWithTitle:@"Zoom" action:@selector(performZoom:)
+		   target:nil],
+	    [NSMenuItem separatorItem],
+	    [NSMenuItem itemWithTitle:@"Bring All to Front"
+		   action:@selector(arrangeInFront:)],
+	    nil] retain];
+    TKMenu *windowsMenu = [TKMenu menuWithTitle:@"Window" menuItems:
+	    _defaultWindowsMenuItems];
+    _defaultHelpMenuItems = [[NSArray arrayWithObjects:
+	    [NSMenuItem itemWithTitle:
+		   [NSString stringWithFormat:@"%@ Help", applicationName]
+		   action:@selector(showHelp:) keyEquivalent:@"?"],
+	    nil] retain];
+    TKMenu *helpMenu = [TKMenu menuWithTitle:@"Help" menuItems:
+	    _defaultHelpMenuItems];
+    [self setServicesMenu:_servicesMenu];
+    [self setWindowsMenu:windowsMenu];
+    _defaultMainMenu = [[TKMenu menuWithTitle:@"" submenus:[NSArray
+	    arrayWithObjects:_defaultApplicationMenu, fileMenu, editMenu,
+	    windowsMenu, helpMenu, nil]] retain];
+    [_defaultMainMenu setSpecial:tkMainMenu];
+    [_defaultApplicationMenu setSpecial:tkApplicationMenu];
+    [windowsMenu setSpecial:tkWindowsMenu];
+    [helpMenu setSpecial:tkHelpMenu];
+    [self tkSetMainMenu:nil];
+}
+- (void)dealloc {
+    [_defaultMainMenu release];
+    [_defaultHelpMenuItems release];
+    [_defaultWindowsMenuItems release];
+    [_defaultApplicationMenuItems release];
+    [super dealloc];
+}
+- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem {
+    SEL action = [anItem action];
 
-#define EDIT_CUT		1
-#define EDIT_COPY		2
-#define EDIT_PASTE		3
-#define EDIT_CLEAR		4
+    if (sel_isEqual(action, @selector(preferences:))) {
+	Tcl_CmdInfo dummy;
+	return (_eventInterp && Tcl_GetCommandInfo(_eventInterp,
+		"::tk::mac::ShowPreferences", &dummy));
+    } else if (sel_isEqual(action, @selector(tkDemo:))) {
+	BOOL haveDemo = NO;
+	if (_eventInterp) {
+	    Tcl_Obj *path = GetWidgetDemoPath(_eventInterp);
 
-MenuRef tkAppleMenu;
-MenuRef tkFileMenu;
-MenuRef tkEditMenu;
+	    if (path) {
+		Tcl_IncrRefCount(path);
+		haveDemo = (Tcl_FSAccess(path, R_OK) == 0);
+		Tcl_DecrRefCount(path);
+	    }
+	}
+	return haveDemo;
+    } else {
+        return [super validateUserInterfaceItem:anItem];
+    }
+}
+- (void)orderFrontStandardAboutPanel:(id)sender {
+    Tcl_CmdInfo dummy;
+    if (!_eventInterp || !Tcl_GetCommandInfo(_eventInterp, "tkAboutDialog",
+	    &dummy) || (GetCurrentEventKeyModifiers() & optionKey)) {
+	TkAboutDlg();
+    } else {
+	int code = Tcl_EvalEx(_eventInterp, "tkAboutDialog", -1,
+		TCL_EVAL_GLOBAL);
+	if (code != TCL_OK) {
+	    Tcl_BackgroundError(_eventInterp);
+	}
+	Tcl_ResetResult(_eventInterp);
+    }
+}
+- (void)showHelp:(id)sender {
+    Tcl_CmdInfo dummy;
+    if (!_eventInterp || !Tcl_GetCommandInfo(_eventInterp,
+	    "::tk::mac::ShowHelp", &dummy)) {
+	[super showHelp:sender];
+    } else {
+	int code = Tcl_EvalEx(_eventInterp, "::tk::mac::ShowHelp", -1,
+		TCL_EVAL_GLOBAL);
+	if (code != TCL_OK) {
+	    Tcl_BackgroundError(_eventInterp);
+	}
+	Tcl_ResetResult(_eventInterp);
+    }
+}
+- (void)tkSource:(id)sender {
+    if (_eventInterp) {
+	if (Tcl_EvalEx(_eventInterp, "tk_getOpenFile -filetypes {"
+		"{{TCL Scripts} {.tcl} TEXT} {{Text Files} {} TEXT}}",
+		-1, TCL_EVAL_GLOBAL) == TCL_OK) {
+	    Tcl_Obj *path = Tcl_GetObjResult(_eventInterp);
+	    int len;
+	    Tcl_GetStringFromObj(path, &len);
+	    if (len) {
+		Tcl_IncrRefCount(path);
+		int code = Tcl_FSEvalFile(_eventInterp, path);
+		if (code != TCL_OK) {
+		    Tcl_BackgroundError(_eventInterp);
+		}
+		Tcl_DecrRefCount(path);
+	    }
+	}
+	Tcl_ResetResult(_eventInterp);
+    }
+}
+- (void)tkDemo:(id)sender {
+    if (_eventInterp) {
+	Tcl_Obj *path = GetWidgetDemoPath(_eventInterp);
+	if (path) {
+	    Tcl_IncrRefCount(path);
+	    int code = Tcl_FSEvalFile(_eventInterp, path);
+	    if (code != TCL_OK) {
+		Tcl_BackgroundError(_eventInterp);
+	    }
+	    Tcl_DecrRefCount(path);
+	    Tcl_ResetResult(_eventInterp);
+	}
+    }
+}
+@end
 
-static Tcl_Interp * gInterp = NULL;	    /* Standard menu interpreter. */
-static EventHandlerRef menuEventHandlerRef = NULL;
+#pragma mark TKContentView(TKMenus)
 
-static void GenerateEditEvent(int flag);
-static Tcl_Obj* GetWidgetDemoPath(Tcl_Interp *interp);
-static OSStatus MenuEventHandlerProc(EventHandlerCallRef callRef,
-	EventRef event, void *userData);
+@implementation TKContentView(TKMenus)
+- (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)anItem {
+    return YES;
+}
+#define EDIT_ACTION(a, e) \
+    - (void) a:(id)sender { \
+	if ([sender isKindOfClass:[NSMenuItem class]]) { \
+	    GenerateEditEvent(#e); \
+	} \
+    }
+EDIT_ACTION(cut, Cut)
+EDIT_ACTION(copy, Copy)
+EDIT_ACTION(paste, Paste)
+EDIT_ACTION(delete, Clear)
+EDIT_ACTION(undo, Undo)
+EDIT_ACTION(redo, Redo)
+#undef EDIT_ACTION
+@end
 
+#pragma mark -
 
 /*
  *----------------------------------------------------------------------
@@ -57,20 +254,22 @@ static OSStatus MenuEventHandlerProc(EventHandlerCallRef callRef,
  *----------------------------------------------------------------------
  */
 
-Tcl_Obj*
+static Tcl_Obj *
 GetWidgetDemoPath(
     Tcl_Interp *interp)
 {
-    Tcl_Obj *libpath , *result = NULL;
+    Tcl_Obj *libpath, *result = NULL;
 
-    libpath = Tcl_GetVar2Ex(gInterp, "tk_library", NULL, TCL_GLOBAL_ONLY);
+    libpath = Tcl_GetVar2Ex(interp, "tk_library", NULL, TCL_GLOBAL_ONLY);
     if (libpath) {
 	Tcl_Obj *demo[2] = {	Tcl_NewStringObj("demos", 5),
 				Tcl_NewStringObj("widget", 6) };
-	
+
 	Tcl_IncrRefCount(libpath);
 	result = Tcl_FSJoinToPath(libpath, 2, demo);
 	Tcl_DecrRefCount(libpath);
+    } else {
+	Tcl_ResetResult(interp);
     }
     return result;
 }
@@ -93,151 +292,11 @@ GetWidgetDemoPath(
 
 void
 TkMacOSXHandleMenuSelect(
-    MenuID theMenu,
-    MenuItemIndex theItem,
+    short theMenu,
+    unsigned short theItem,
     int optionKeyPressed)
 {
-    Tk_Window tkwin;
-    Window window;
-    TkDisplay *dispPtr;
-
-    if (theItem == 0) {
-	TkMacOSXClearMenubarActive();
-	return;
-    }
-
-    switch (theMenu) {
-	case kAppleMenu:
-	    switch (theItem) {
-		case kAppleAboutItem:
-		    {
-			Tcl_CmdInfo dummy;
-			if (optionKeyPressed || gInterp == NULL ||
-			    Tcl_GetCommandInfo(gInterp,
-				"tkAboutDialog", &dummy) == 0) {
-			    TkAboutDlg();
-			} else {
-			    if (Tcl_EvalEx(gInterp, "tkAboutDialog", -1,
-				    TCL_EVAL_GLOBAL) != TCL_OK) {
-				Tcl_BackgroundError(gInterp);
-			    }
-			    Tcl_ResetResult(gInterp);
-			}
-			break;
-		    }
-	    }
-	    break;
-	case kFileMenu:
-	    switch (theItem) {
-		case kSourceItem:
-		    if (gInterp) {
-			if(Tcl_EvalEx(gInterp, "tk_getOpenFile -filetypes {"
-				"{{TCL Scripts} {.tcl} TEXT} "
-				"{{Text Files} {} TEXT}}", -1, TCL_EVAL_GLOBAL)
-				== TCL_OK) {
-			    Tcl_Obj *path = Tcl_GetObjResult(gInterp);
-			    int len;
-			    
-			    Tcl_GetStringFromObj(path, &len);
-			    if (len) {
-				Tcl_IncrRefCount(path);
-				if (Tcl_FSEvalFile(gInterp, path)
-					== TCL_ERROR) {
-				    Tcl_BackgroundError(gInterp);
-				}
-				Tcl_DecrRefCount(path);
-			    }
-			}
-			Tcl_ResetResult(gInterp);
-		    }
-		    break;
-		case kDemoItem:
-		    if (gInterp) {
-			Tcl_Obj *path = GetWidgetDemoPath(gInterp);
-
-			if (path) {
-			    Tcl_IncrRefCount(path);
-			    if (Tcl_FSEvalFile(gInterp, path)
-				    == TCL_ERROR) {
-				Tcl_BackgroundError(gInterp);
-			    }
-			    Tcl_DecrRefCount(path);
-			    Tcl_ResetResult(gInterp);
-			}
-		    }
-		    break;
-		case kCloseItem:
-		    /* Send close event */
-		    window = TkMacOSXGetXWindow(ActiveNonFloatingWindow());
-		    dispPtr = TkGetDisplayList();
-		    tkwin = Tk_IdToWindow(dispPtr->display, window);
-		    TkGenWMDestroyEvent(tkwin);
-		    break;
-	    }
-	    break;
-	case kEditMenu:
-	    /*
-	     * This implementation just send the keysyms Tk thinks are
-	     * associated with function keys that do Cut, Copy & Paste on
-	     * a Sun keyboard.
-	     */
-	    GenerateEditEvent(theItem);
-	    break;
-	default:
-	    TkMacOSXDispatchMenuEvent(theMenu, theItem);
-	    break;
-    }
-    /*
-     * Finally we unhighlight the menu.
-     */
-    HiliteMenu(0);
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * MenuEventHandlerProc --
- *
- *	One-time handler of kEventMenuEnableItems for the edit menu.
- *
- * Results:
- *	OS status code.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static OSStatus
-MenuEventHandlerProc(
-    EventHandlerCallRef callRef,
-    EventRef event,
-    void *userData)
-{
-    OSStatus result = eventNotHandledErr, err;
-    int menuContext;
-
-    err = ChkErr(GetEventParameter, event, kEventParamMenuContext, typeUInt32,
-	    NULL, sizeof(menuContext), NULL, &menuContext);
-    if (err == noErr && (menuContext & kMenuContextMenuBarTracking)) {
-	if (gInterp) {
-	    Tcl_Obj *path = GetWidgetDemoPath(gInterp);
-
-	    if (path) {
-		Tcl_IncrRefCount(path);
-		if (Tcl_FSAccess(path, R_OK) == 0) {
-		    EnableMenuItem(tkFileMenu, kDemoItem);
-		}
-		Tcl_DecrRefCount(path);
-	    }
-	}
-	ChkErr(RemoveEventHandler, menuEventHandlerRef);
-	menuEventHandlerRef = NULL;
-	result = noErr;
-    }
-
-    return result;
+    Tcl_Panic("TkMacOSXHandleMenuSelect: Obsolete, no more Carbon!");
 }
 
 /*
@@ -260,75 +319,7 @@ void
 TkMacOSXInitMenus(
     Tcl_Interp *interp)
 {
-    OSStatus err;
-    EventHandlerUPP menuEventHandlerUPP;
-    const EventTypeSpec menuEventTypes[] = {
-	{kEventClassMenu, kEventMenuEnableItems},
-    };
-
-    gInterp = interp;
-    if (TkMacOSXUseMenuID(kAppleMenu) != TCL_OK) {
-	Tcl_Panic("Menu ID %d is already in use!", kAppleMenu);
-    }
-    err = ChkErr(CreateNewMenu, kAppleMenu, kMenuAttrDoNotUseUserCommandKeys,
-	    &tkAppleMenu);
-    if (err != noErr) {
-	Tcl_Panic("CreateNewMenu failed !");
-    }
-    SetMenuTitle(tkAppleMenu, "\p\024");
-    InsertMenu(tkAppleMenu, 0);
-    AppendMenu(tkAppleMenu, "\pAbout Tcl & Tk\xc9");
-    AppendMenu(tkAppleMenu, "\p(-");
-
-    if (TkMacOSXUseMenuID(kFileMenu) != TCL_OK) {
-	Tcl_Panic("Menu ID %d is already in use!", kFileMenu);
-    }
-    err = ChkErr(CreateNewMenu, kFileMenu, kMenuAttrDoNotUseUserCommandKeys,
-	    &tkFileMenu);
-    if (err != noErr) {
-	Tcl_Panic("CreateNewMenu failed !");
-    }
-    SetMenuTitle(tkFileMenu, "\pFile");
-    InsertMenu(tkFileMenu, 0);
-    InsertMenuItem(tkFileMenu, "\pSource\xc9", kSourceItem - 1);
-    InsertMenuItem(tkFileMenu, "\pRun Widget Demo", kDemoItem - 1);
-    InsertMenuItem(tkFileMenu, "\pClose/W", kCloseItem - 1);
-    DisableMenuItem(tkFileMenu, kDemoItem);
-    menuEventHandlerUPP = NewEventHandlerUPP(MenuEventHandlerProc);
-    ChkErr(InstallEventHandler, GetMenuEventTarget(tkFileMenu),
-	    menuEventHandlerUPP, GetEventTypeCount(menuEventTypes),
-	    menuEventTypes, NULL, &menuEventHandlerRef);
-    DisposeEventHandlerUPP(menuEventHandlerUPP);
-
-    if (TkMacOSXUseMenuID(kEditMenu) != TCL_OK) {
-	Tcl_Panic("Menu ID %d is already in use!", kEditMenu);
-    }
-    err = ChkErr(CreateNewMenu, kEditMenu, kMenuAttrDoNotUseUserCommandKeys,
-	    &tkEditMenu);
-    if (err != noErr) {
-	Tcl_Panic("CreateNewMenu failed !");
-    }
-    SetMenuTitle(tkEditMenu, "\pEdit");
-    InsertMenu(tkEditMenu, 0);
-    AppendMenu(tkEditMenu, "\pCut/X");
-    AppendMenu(tkEditMenu, "\pCopy/C");
-    AppendMenu(tkEditMenu, "\pPaste/V");
-    AppendMenu(tkEditMenu, "\pClear");
-    if (TkMacOSXUseMenuID(kHMHelpMenuID) != TCL_OK) {
-	Tcl_Panic("Help menu ID %s is already in use!", kHMHelpMenuID);
-    }
-
-    /*
-     * Workaround a Carbon bug with kHICommandPreferences: the first call to
-     * IsMenuKeyEvent returns false for the preferences menu item key shorcut
-     * event (even if the corresponding menu item is dynamically enabled by a
-     * kEventCommandUpdateStatus handler), unless the kHICommandPreferences
-     * menu item has previously been enabled manually. [Bug 1481503]
-     */
-    EnableMenuCommand(NULL, kHICommandPreferences);
-
-    DrawMenuBar();
-    return;
+    [NSApp _setupMenus];
 }
 
 /*
@@ -336,8 +327,8 @@ TkMacOSXInitMenus(
  *
  * GenerateEditEvent --
  *
- *	Takes an edit menu item and posts the corasponding a virtual
- *	event to Tk's event queue.
+ *	Takes an edit menu item and posts the corasponding a virtual event to
+ *	Tk's event queue.
  *
  * Results:
  *	None.
@@ -350,50 +341,133 @@ TkMacOSXInitMenus(
 
 static void
 GenerateEditEvent(
-    int flag)
+    const char *name)
 {
     XVirtualEvent event;
     int x, y;
-    Tk_Window tkwin;
-    Window window;
-    TkDisplay *dispPtr;
+    TkWindow *winPtr = TkMacOSXGetTkWindow([NSApp keyWindow]);
+    Tk_Window tkwin = (Tk_Window) winPtr;
 
-    window = TkMacOSXGetXWindow(ActiveNonFloatingWindow());
-    dispPtr = TkGetDisplayList();
-    tkwin = Tk_IdToWindow(dispPtr->display, window);
-    tkwin = (Tk_Window) ((TkWindow *) tkwin)->dispPtr->focusPtr;
     if (tkwin == NULL) {
 	return;
     }
-
+    tkwin = (Tk_Window) winPtr->dispPtr->focusPtr;
+    if (tkwin == NULL) {
+	return;
+    }
     bzero(&event, sizeof(XVirtualEvent));
     event.type = VirtualEvent;
-    event.serial = Tk_Display(tkwin)->request;
+    event.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
     event.send_event = false;
     event.display = Tk_Display(tkwin);
     event.event = Tk_WindowId(tkwin);
     event.root = XRootWindow(Tk_Display(tkwin), 0);
     event.subwindow = None;
     event.time = TkpGetMS();
-
-    XQueryPointer(NULL, None, NULL, NULL,
+    XQueryPointer(NULL, winPtr->window, NULL, NULL,
 	    &event.x_root, &event.y_root, &x, &y, &event.state);
-    tkwin = Tk_TopCoordsToWindow(tkwin, x, y, &event.x, &event.y);
+    Tk_TopCoordsToWindow(tkwin, x, y, &event.x, &event.y);
     event.same_screen = true;
+    event.name = Tk_GetUid(name);
+    Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
+}
 
-    switch (flag) {
-	case EDIT_CUT:
-	    event.name = Tk_GetUid("Cut");
-	    break;
-	case EDIT_COPY:
-	    event.name = Tk_GetUid("Copy");
-	    break;
-	case EDIT_PASTE:
-	    event.name = Tk_GetUid("Paste");
-	    break;
-	case EDIT_CLEAR:
-	    event.name = Tk_GetUid("Clear");
-	    break;
+#pragma mark -
+#pragma mark NSMenu & NSMenuItem Utilities
+
+@implementation NSMenu(TKUtils)
++ (id)menuWithTitle:(NSString *)title {
+    NSMenu *m = [[self alloc] initWithTitle:title];
+    return [m autorelease];
+}
++ (id)menuWithTitle:(NSString *)title menuItems:(NSArray *)items {
+    NSMenu *m = [[self alloc] initWithTitle:title];
+    for (NSMenuItem *i in items) {
+	[m addItem:i];
     }
-    Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
+    return [m autorelease];
+}
++ (id)menuWithTitle:(NSString *)title submenus:(NSArray *)submenus {
+    NSMenu *m = [[self alloc] initWithTitle:title];
+    for (NSMenu *i in submenus) {
+	[m addItem:[NSMenuItem itemWithSubmenu:i]];
+    }
+    return [m autorelease];
+}
+- (NSMenuItem *)itemWithSubmenu:(NSMenu *)submenu {
+    return [self itemAtIndex:[self indexOfItemWithSubmenu:submenu]];
 }
+- (NSMenuItem *)itemInSupermenu {
+    NSMenu *supermenu = [self supermenu];
+    return (supermenu ? [supermenu itemWithSubmenu:self] : nil);
+}
+@end
+
+@implementation NSMenuItem(TKUtils)
++ (id)itemWithSubmenu:(NSMenu *)submenu {
+    NSMenuItem *i = [[self alloc] initWithTitle:[submenu title] action:NULL
+	    keyEquivalent:@""];
+    [i setSubmenu:submenu];
+    return [i autorelease];
+}
++ (id)itemWithTitle:(NSString *)title submenu:(NSMenu *)submenu {
+    NSMenuItem *i = [[self alloc] initWithTitle:title action:NULL
+	    keyEquivalent:@""];
+    [i setSubmenu:submenu];
+    return [i autorelease];
+}
++ (id)itemWithTitle:(NSString *)title action:(SEL)action {
+    NSMenuItem *i = [[self alloc] initWithTitle:title action:action
+	    keyEquivalent:@""];
+    [i setTarget:NSApp];
+    return [i autorelease];
+}
++ (id)itemWithTitle:(NSString *)title action:(SEL)action
+	target:(id)target {
+    NSMenuItem *i = [[self alloc] initWithTitle:title action:action
+	    keyEquivalent:@""];
+    [i setTarget:target];
+    return [i autorelease];
+}
++ (id)itemWithTitle:(NSString *)title action:(SEL)action
+	keyEquivalent:(NSString *)keyEquivalent {
+    NSMenuItem *i = [[self alloc] initWithTitle:title action:action
+	    keyEquivalent:keyEquivalent];
+    [i setTarget:NSApp];
+    return [i autorelease];
+}
++ (id)itemWithTitle:(NSString *)title action:(SEL)action
+	target:(id)target keyEquivalent:(NSString *)keyEquivalent {
+    NSMenuItem *i = [[self alloc] initWithTitle:title action:action
+	    keyEquivalent:keyEquivalent];
+    [i setTarget:target];
+    return [i autorelease];
+}
++ (id)itemWithTitle:(NSString *)title action:(SEL)action
+	keyEquivalent:(NSString *)keyEquivalent
+	keyEquivalentModifierMask:(NSUInteger)keyEquivalentModifierMask {
+    NSMenuItem *i = [[self alloc] initWithTitle:title action:action
+	    keyEquivalent:keyEquivalent];
+    [i setTarget:NSApp];
+    [i setKeyEquivalentModifierMask:keyEquivalentModifierMask];
+    return [i autorelease];
+}
++ (id)itemWithTitle:(NSString *)title action:(SEL)action
+	target:(id)target keyEquivalent:(NSString *)keyEquivalent
+	keyEquivalentModifierMask:(NSUInteger)keyEquivalentModifierMask {
+    NSMenuItem *i = [[self alloc] initWithTitle:title action:action
+	    keyEquivalent:keyEquivalent];
+    [i setTarget:target];
+    [i setKeyEquivalentModifierMask:keyEquivalentModifierMask];
+    return [i autorelease];
+}
+@end
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 79
+ * coding: utf-8
+ * End:
+ */