Mercurial > emacs
comparison src/nsmenu.m @ 102433:6d9c8e198f1c
(EmacsMenu-addItemWithWidgetValue:): Don't add accelerator in parens under GNUstep.
author | Adrian Robert <Adrian.B.Robert@gmail.com> |
---|---|
date | Fri, 06 Mar 2009 19:06:45 +0000 |
parents | e1a5d89a91dd |
children | b5a34573cf82 |
comparison
equal
deleted
inserted
replaced
102432:928c9091126b | 102433:6d9c8e198f1c |
---|---|
634 title = [NSString stringWithUTF8String: wv->name]; | 634 title = [NSString stringWithUTF8String: wv->name]; |
635 if (title == nil) | 635 if (title == nil) |
636 title = @"< ? >"; /* (get out in the open so we know about it) */ | 636 title = @"< ? >"; /* (get out in the open so we know about it) */ |
637 | 637 |
638 keyEq = [self parseKeyEquiv: wv->key]; | 638 keyEq = [self parseKeyEquiv: wv->key]; |
639 #ifdef NS_IMPL_COCOA | |
640 /* OS X just ignores modifier strings longer than one character */ | |
639 if (keyEquivModMask == 0) | 641 if (keyEquivModMask == 0) |
640 title = [title stringByAppendingFormat: @" (%@)", keyEq]; | 642 title = [title stringByAppendingFormat: @" (%@)", keyEq]; |
643 #endif | |
641 | 644 |
642 item = [self addItemWithTitle: (NSString *)title | 645 item = [self addItemWithTitle: (NSString *)title |
643 action: @selector (menuDown:) | 646 action: @selector (menuDown:) |
644 keyEquivalent: keyEq]; | 647 keyEquivalent: keyEq]; |
645 [item setKeyEquivalentModifierMask: keyEquivModMask]; | 648 [item setKeyEquivalentModifierMask: keyEquivModMask]; |