diff options
| author | Kevin Walzer <kw@codebykevin.com> | 2012-01-29 16:36:28 (GMT) |
|---|---|---|
| committer | Kevin Walzer <kw@codebykevin.com> | 2012-01-29 16:36:28 (GMT) |
| commit | 083df11eea2599a5abdb6a213faa2991a5e6ada1 (patch) | |
| tree | 0928dd1c5453cdab0439e19104a4b93f54e59d57 /macosx/tkMacOSXKeyboard.c | |
| parent | ee98c5f67ad4c1b52997428b3af01c4282cd9bfa (diff) | |
| download | tk-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/tkMacOSXKeyboard.c')
| -rw-r--r-- | macosx/tkMacOSXKeyboard.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/macosx/tkMacOSXKeyboard.c b/macosx/tkMacOSXKeyboard.c index a51f970..d388f60 100644 --- a/macosx/tkMacOSXKeyboard.c +++ b/macosx/tkMacOSXKeyboard.c @@ -766,11 +766,11 @@ TkpGetKeySym( } } -#if 0 + /* If nbytes has been set, it's not a function key, but a regular key that + has been translated in tkMacOSXKeyEvent.c; just use that. */ if (eventPtr->xkey.nbytes) { - return eventPtr->xkey.nbytes; + return eventPtr->xkey.keycode & 0xFFFF; } -#endif /* * Figure out which of the four slots in the keymap vector to use for this |