mirror of
https://github.com/macvim-dev/macvim.git
synced 2026-06-11 15:37:29 +02:00
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.
This commit is contained in:
@@ -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];
|
||||
|
||||
@@ -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];
|
||||
|
||||
Reference in New Issue
Block a user