# HG changeset patch # User leonidr # Date 1351871232 -14400 # Node ID 310bfcd9c9323e7886532e6814f839129d04ff81 # Parent b2492ea8d08e457039d9699bb0c1e9fe370ff826 8002114: fix failed for JDK-7160951: [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar Reviewed-by: serb diff -r b2492ea8d08e -r 310bfcd9c932 jdk/src/macosx/native/sun/awt/CMenuItem.m --- a/jdk/src/macosx/native/sun/awt/CMenuItem.m Fri Nov 02 19:20:03 2012 +0400 +++ b/jdk/src/macosx/native/sun/awt/CMenuItem.m Fri Nov 02 19:47:12 2012 +0400 @@ -76,7 +76,7 @@ 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; }