From bf72a7f92d1fc03a055164bdda82f1280e7cf108 Mon Sep 17 00:00:00 2001 From: Blair Duncan Date: Mon, 29 Nov 2010 21:55:33 -0500 Subject: [PATCH] added support for escape key to cancel menus, removed unused var --- AppKit/CPMenu/_CPMenuManager.j | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/AppKit/CPMenu/_CPMenuManager.j b/AppKit/CPMenu/_CPMenuManager.j index 0e1a7b01a..9f1366269 100644 --- a/AppKit/CPMenu/_CPMenuManager.j +++ b/AppKit/CPMenu/_CPMenuManager.j @@ -266,9 +266,6 @@ var SharedMenuManager = nil; // Stop all periodic events at this point. [CPEvent stopPeriodicEvents]; - // Get the highlighted item from the original menu. - var highlightedItem = [trackingMenu highlightedItem]; - // Hide all submenus. [self showMenu:nil fromMenu:trackingMenu atPoint:nil]; @@ -552,5 +549,11 @@ var SharedMenuManager = nil; [menu cancelTracking] } +- (void)cancelOperation:(CPMenu)menu +{ + [menu _highlightItemAtIndex:CPNotFound]; + [CPEvent stopPeriodicEvents]; + [[self trackingMenu] cancelTracking]; +} @end