summaryrefslogtreecommitdiffstats
path: root/generic/tkBind.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-12 21:04:47 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-12 21:04:47 (GMT)
commit6543fa41fa55392ee287df3d24888f2662bb7b8d (patch)
tree063bedd2c23caf56c700b120451a3e5f80fe1def /generic/tkBind.c
parent344dce41c2bb55fa7708a2257500ab98ef51829e (diff)
parent2b6251c4c824d5477da8fa35609508dde84084f7 (diff)
downloadtk-6543fa41fa55392ee287df3d24888f2662bb7b8d.zip
tk-6543fa41fa55392ee287df3d24888f2662bb7b8d.tar.gz
tk-6543fa41fa55392ee287df3d24888f2662bb7b8d.tar.bz2
merge trunk
Diffstat (limited to 'generic/tkBind.c')
-rw-r--r--generic/tkBind.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c
index 53a2046..6841f1e 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -2147,7 +2147,7 @@ ExpandPercents(
}
goto doNumber;
case 'A':
- if (flags & KEY) {
+ if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) {
Tcl_DStringFree(&buf);
string = TkpGetString(winPtr, eventPtr, &buf);
}