diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-06 23:17:17 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-06 23:17:17 (GMT) |
| commit | 0b3d14e18851043e6661f443c146717f372854e3 (patch) | |
| tree | d008927dd7a04cca116dd1b3a0e145ee035f5f9a | |
| parent | edf582e29363915f6b8ea7954176768d8545934f (diff) | |
| download | tk-0b3d14e18851043e6661f443c146717f372854e3.zip tk-0b3d14e18851043e6661f443c146717f372854e3.tar.gz tk-0b3d14e18851043e6661f443c146717f372854e3.tar.bz2 | |
[Bug 3176239] control-MouseWheel causes segv
| -rwxr-xr-x | ChangeLog | 4 | ||||
| -rwxr-xr-x[-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-29 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 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); } |