summaryrefslogtreecommitdiffstats
path: root/macosx/tkMacOSXMenu.c
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2012-01-29 16:36:28 (GMT)
committerKevin Walzer <kw@codebykevin.com>2012-01-29 16:36:28 (GMT)
commit083df11eea2599a5abdb6a213faa2991a5e6ada1 (patch)
tree0928dd1c5453cdab0439e19104a4b93f54e59d57 /macosx/tkMacOSXMenu.c
parentee98c5f67ad4c1b52997428b3af01c4282cd9bfa (diff)
downloadtk-083df11eea2599a5abdb6a213faa2991a5e6ada1.zip
tk-083df11eea2599a5abdb6a213faa2991a5e6ada1.tar.gz
tk-083df11eea2599a5abdb6a213faa2991a5e6ada1.tar.bz2
Fix for serious bugs with input methods, and for display of certain fonts in buttons; thanks to Adrian Robert for extensive patches
Diffstat (limited to 'macosx/tkMacOSXMenu.c')
-rw-r--r--macosx/tkMacOSXMenu.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index 19db490..d04f0cd 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -292,6 +292,12 @@ static int ModifierCharWidth(Tk_Font tkfont);
return NO;
}
+ // For command key, take input manager's word so things
+ // like dvorak / qwerty layout work.
+ if (([event modifierFlags] & NSCommandKeyMask) == NSCommandKeyMask) {
+ key = [event characters];
+ }
+
NSArray *itemArray = [self itemArray];
for (NSMenuItem *item in itemArray) {