diff options
| author | dgp <dgp@users.sourceforge.net> | 2015-03-05 16:25:27 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2015-03-05 16:25:27 (GMT) |
| commit | 733aeb64f20372fdb6af4f3e4c0aad7b4b923085 (patch) | |
| tree | 91f989b6b830962ee9ad71ba0e08733474b2d9cb | |
| parent | 9273894f7d01df4e407b38d0f343a9d184f64643 (diff) | |
| parent | 4c1308ad477522bc98eea3a93e4085abba195a56 (diff) | |
| download | tk-733aeb64f20372fdb6af4f3e4c0aad7b4b923085.zip tk-733aeb64f20372fdb6af4f3e4c0aad7b4b923085.tar.gz tk-733aeb64f20372fdb6af4f3e4c0aad7b4b923085.tar.bz2 | |
merge 8.5
| -rw-r--r-- | macosx/tkMacOSXKeyboard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c index f776562..7579ee6 100644 --- a/macosx/tkMacOSXKeyboard.c +++ b/macosx/tkMacOSXKeyboard.c @@ -734,7 +734,7 @@ 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; |