Skip to content

Commit

Permalink
Disable default main menu key equivalent hack
Browse files Browse the repository at this point in the history
In performKeyEquivalent: do not pass the key equivalent to
defaultMainMenu since this breaks the menus on OS X 10.4.  Also, this
hack is not strictly needed now that window cycling is hardcoded (and a
"New Window" menu is always available on the dock menu) so it is just as
well that it is removed.
  • Loading branch information
b4winckler committed Jun 12, 2008
1 parent 21b0297 commit 7b68b0b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 16 deletions.
8 changes: 0 additions & 8 deletions src/MacVim/MMAtsuiTextView.m
Original file line number Diff line number Diff line change
Expand Up @@ -418,14 +418,6 @@ - (BOOL)performKeyEquivalent:(NSEvent *)event
if ([[NSApp mainMenu] performKeyEquivalent:event])
return YES;

// HACK! Give the default main menu a chance to handle the key down event.
// This is to ensure that the standard mappings (which are in the default
// main menu) are always available, also when the default Vim menus are
// used (these do not set any key equivalents!).
if ([[[MMAppController sharedInstance] defaultMainMenu]
performKeyEquivalent:event])
return YES;

// HACK! On Leopard Ctrl-key events end up here instead of keyDown:.
if (flags & NSControlKeyMask) {
[self keyDown:event];
Expand Down
8 changes: 0 additions & 8 deletions src/MacVim/MMTextView.m
Original file line number Diff line number Diff line change
Expand Up @@ -652,14 +652,6 @@ - (BOOL)performKeyEquivalent:(NSEvent *)event
if ([[NSApp mainMenu] performKeyEquivalent:event])
return YES;

// HACK! Give the default main menu a chance to handle the key down event.
// This is to ensure that the standard mappings (which are in the default
// main menu) are always available, also when the default Vim menus are
// used (these do not set any key equivalents!).
if ([[[MMAppController sharedInstance] defaultMainMenu]
performKeyEquivalent:event])
return YES;

// HACK! On Leopard Ctrl-key events end up here instead of keyDown:.
if (flags & NSControlKeyMask) {
[self keyDown:event];
Expand Down

0 comments on commit 7b68b0b

Please sign in to comment.