diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-26 13:12:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-26 13:12:42 (GMT) |
| commit | caa3f5c131dc0d5004e32a64164567a4328ca136 (patch) | |
| tree | 5887c0ef002a9be546aeacfc13a3f2c4104223f8 /generic/tkBind.c | |
| parent | 604b9d13db47430c5f580290a801beae05eef13e (diff) | |
| parent | 8cc7bce73e9997bd6f37cf9e35c4840be1912c8c (diff) | |
| download | tk-caa3f5c131dc0d5004e32a64164567a4328ca136.zip tk-caa3f5c131dc0d5004e32a64164567a4328ca136.tar.gz tk-caa3f5c131dc0d5004e32a64164567a4328ca136.tar.bz2 | |
merge trunk
Diffstat (limited to 'generic/tkBind.c')
| -rw-r--r-- | generic/tkBind.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index 8b07007..e58ad4d 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -2028,7 +2028,7 @@ ExpandPercents( string = numStorage; goto doString; case 'k': - if (flags & KEY) { + if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) { number = eventPtr->xkey.keycode; goto doNumber; } @@ -2168,7 +2168,7 @@ ExpandPercents( * This is used only by the MouseWheel event. */ - if (flags & KEY) { + if ((flags & KEY) && (eventPtr->type == MouseWheelEvent)) { number = eventPtr->xkey.keycode; goto doNumber; } @@ -2177,7 +2177,7 @@ ExpandPercents( number = (int) eventPtr->xany.send_event; goto doNumber; case 'K': - if (flags & KEY) { + if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) { const char *name = TkKeysymToString(keySym); if (name != NULL) { @@ -2186,7 +2186,7 @@ ExpandPercents( } goto doString; case 'N': - if (flags & KEY) { + if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) { number = (int) keySym; goto doNumber; } |