From d155e06a5baec09087cc259b3eccc7fdc7833981 Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Thu, 12 Jun 2008 12:58:52 +0200 Subject: [PATCH] Disable default main menu key equivalent hack 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. --- src/MacVim/MMAtsuiTextView.m | 8 -------- src/MacVim/MMTextView.m | 8 -------- 2 files changed, 16 deletions(-) diff --git a/src/MacVim/MMAtsuiTextView.m b/src/MacVim/MMAtsuiTextView.m index c2eaa9c4..cbc51eec 100644 --- a/src/MacVim/MMAtsuiTextView.m +++ b/src/MacVim/MMAtsuiTextView.m @@ -418,14 +418,6 @@ enum { 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]; diff --git a/src/MacVim/MMTextView.m b/src/MacVim/MMTextView.m index c90bc23e..2da91483 100644 --- a/src/MacVim/MMTextView.m +++ b/src/MacVim/MMTextView.m @@ -652,14 +652,6 @@ enum { 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]; -- 2.11.4.GIT