summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2008-08-20 09:50:54 -0700
committerJeremy Huddleston <jeremyhu@freedesktop.org>2008-08-20 10:00:43 -0700
commitf1f44940f10b0209946ec0f08104a372d7d945a0 (patch)
tree86ed6199ca8d8bf3ab9953cf368975a0b97b586d
parent6c5612c2e1df1e89388ffff97251f5328558f8e8 (diff)
XQuartz: Support windowItemModMask=0 or -1 to disable window shortcuts.
(cherry picked from commit 81187364e512606a6aebb95ab2967d9d420f57f2) (cherry picked from commit f2ec79e4a159dec6481691e4dd615db01770dd7a)
-rw-r--r--hw/xquartz/X11Controller.m5
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 682a6922a..19a4d2b8f 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -139,7 +139,10 @@
name = [[list objectAtIndex:i] objectAtIndex:0];
shortcut = [[list objectAtIndex:i] objectAtIndex:1];
-
+
+ if(windowItemModMask == 0 || windowItemModMask == -1)
+ shortcut = @"";
+
item = (NSMenuItem *) [menu addItemWithTitle:name action:@selector
(item_selected:) keyEquivalent:shortcut];