summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-06 23:17:17 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-04-06 23:17:17 (GMT)
commit0b3d14e18851043e6661f443c146717f372854e3 (patch)
treed008927dd7a04cca116dd1b3a0e145ee035f5f9a /generic
parentedf582e29363915f6b8ea7954176768d8545934f (diff)
downloadtk-0b3d14e18851043e6661f443c146717f372854e3.zip
tk-0b3d14e18851043e6661f443c146717f372854e3.tar.gz
tk-0b3d14e18851043e6661f443c146717f372854e3.tar.bz2
[Bug 3176239] control-MouseWheel causes segv
Diffstat (limited to 'generic')
-rwxr-xr-x[-rw-r--r--]generic/tkBind.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c
index c3ee5a1..3f05ccc 100644..100755
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -2547,7 +2547,7 @@ ExpandPercents(winPtr, before, eventPtr, keySym, dsPtr)
}
goto doNumber;
case 'A':
- if (flags & KEY) {
+ if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) {
Tcl_DStringFree(&buf);
string = TkpGetString(winPtr, eventPtr, &buf);
}