summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--generic/tkBind.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 72e6f47..0d7f416 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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);
}