diff options
| author | dgp@users.sourceforge.net <dgp> | 2015-03-05 16:25:27 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2015-03-05 16:25:27 (GMT) |
| commit | 18ae109ef095cf82b3f4efd40b263fb189a7b7f6 (patch) | |
| tree | f287a5b9e6e63baec355ba209c3ebbcdb3db9d9b | |
| parent | 36e973088b96c4e4f474bbb6f07af3de7116e13a (diff) | |
| parent | c5ff938e4a4573d9b42da8dcce7df2e788ef5c10 (diff) | |
| download | tk-18ae109ef095cf82b3f4efd40b263fb189a7b7f6.zip tk-18ae109ef095cf82b3f4efd40b263fb189a7b7f6.tar.gz tk-18ae109ef095cf82b3f4efd40b263fb189a7b7f6.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; |