diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-03-05 16:25:55 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-03-05 16:25:55 (GMT) |
| commit | 1b9aaa13511a1088243754cc804a97e2e88c1587 (patch) | |
| tree | e6adec419328ada40fb78877d7836835877ad224 | |
| parent | a64d781bd75343dc8033771af67a56bb3b8a87f7 (diff) | |
| parent | 7ec6687e43e5585e8542a975da8b0fe768cd2b3f (diff) | |
| download | tk-1b9aaa13511a1088243754cc804a97e2e88c1587.zip tk-1b9aaa13511a1088243754cc804a97e2e88c1587.tar.gz tk-1b9aaa13511a1088243754cc804a97e2e88c1587.tar.bz2 | |
merge trunk
| -rw-r--r-- | macosx/tkMacOSXKeyboard.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c index 54f99d3..7ac087d 100644 --- a/macosx/tkMacOSXKeyboard.c +++ b/macosx/tkMacOSXKeyboard.c @@ -734,7 +734,8 @@ TkpGetKeySym( */ if (eventPtr->xany.send_event == -1) { - int modifier = eventPtr->xkey.keycode; + + int modifier = eventPtr->xkey.keycode & NSDeviceIndependentModifierFlagsMask; if (modifier == NSCommandKeyMask) { return XK_Meta_L; |