From 99cabdb715349ca95a40adc3d7296aba50716add Mon Sep 17 00:00:00 2001 From: Leonid Romanov Date: Fri, 2 Nov 2012 19:47:12 +0400 Subject: [PATCH] 8002114: fix failed for JDK-7160951: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar Reviewed-by: serb --- jdk/src/macosx/native/sun/awt/CMenuItem.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdk/src/macosx/native/sun/awt/CMenuItem.m b/jdk/src/macosx/native/sun/awt/CMenuItem.m index 7751f3555b9..663860d7ff6 100644 --- a/jdk/src/macosx/native/sun/awt/CMenuItem.m +++ b/jdk/src/macosx/native/sun/awt/CMenuItem.m @@ -76,7 +76,7 @@ JNF_COCOA_ENTER(env); NSEvent *currEvent = [[NSApplication sharedApplication] currentEvent]; if ([currEvent type] == NSKeyDown) { NSString *menuKey = [sender keyEquivalent]; - NSString *eventKey = [currEvent characters]; + NSString *eventKey = [currEvent charactersIgnoringModifiers]; if ([menuKey isEqualToString:eventKey]) { return; }