From 0b3d14e18851043e6661f443c146717f372854e3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 6 Apr 2012 23:17:17 +0000
Subject: [Bug 3176239] control-MouseWheel causes segv

---
 ChangeLog        | 4 ++++
 generic/tkBind.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 generic/tkBind.c

diff --git a/ChangeLog b/ChangeLog
index 1bdaa06..54ab679 100755
--- 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-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
old mode 100644
new mode 100755
index c3ee5a1..3f05ccc
--- 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);
 		}
-- 
cgit v0.12