From ba82e74f0d02978d908a7bed861d60f996d2df8a Mon Sep 17 00:00:00 2001 From: leonidr 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 --- src/macosx/native/sun/awt/CMenuItem.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/macosx/native/sun/awt/CMenuItem.m b/src/macosx/native/sun/awt/CMenuItem.m index 7751f3555..663860d7f 100644 --- a/src/macosx/native/sun/awt/CMenuItem.m +++ b/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; } -- GitLab