diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-06 23:23:06 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-06 23:23:06 (GMT) |
commit | 675dc433081e21fce5e85d36ad8a28383cc6883a (patch) | |
tree | ed57a6408d113fb54c19c03024453c92c15a3516 | |
parent | 34455b2ccec84bccf8f6380ee8ac40637bf4b8f8 (diff) | |
parent | 0b3d14e18851043e6661f443c146717f372854e3 (diff) | |
download | tk-675dc433081e21fce5e85d36ad8a28383cc6883a.zip tk-675dc433081e21fce5e85d36ad8a28383cc6883a.tar.gz tk-675dc433081e21fce5e85d36ad8a28383cc6883a.tar.bz2 |
[Bug 3176239] control-MouseWheel causes segv
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | generic/tkBind.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +2012-04-07 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tkBind.c: [Bug 3176239] control-MouseWheel causes segv + 2012-03-30 Jan Nijtmans <nijtmans@users.sf.net> * unix/tcl.m4: [Bug 3511806] Compiler checks too early diff --git a/generic/tkBind.c b/generic/tkBind.c index cf8ed1d..11b2122 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -2502,7 +2502,7 @@ ExpandPercents( } goto doNumber; case 'A': - if (flags & KEY) { + if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) { Tcl_DStringFree(&buf); string = TkpGetString(winPtr, eventPtr, &buf); } |