merge trunkpspjuth_canvas

1 files changed, 7 insertions, 23 deletions

diff --git a/generic/tkBind.c b/generic/tkBind.c
index e77667f..e58ad4d 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -10,8 +10,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkBind.c,v 1.68 2010/06/21 12:14:08 nijtmans Exp $
  */
 
 #include "tkInt.h"
@@ -2030,7 +2028,7 @@ ExpandPercents(
 	    string = numStorage;
 	    goto doString;
 	case 'k':
-	    if (flags & KEY) {
+	    if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) {
 		number = eventPtr->xkey.keycode;
 		goto doNumber;
 	    }
@@ -2149,7 +2147,7 @@ ExpandPercents(
 	    }
 	    goto doNumber;
 	case 'A':
-	    if (flags & KEY) {
+	    if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) {
 		Tcl_DStringFree(&buf);
 		string = TkpGetString(winPtr, eventPtr, &buf);
 	    }
@@ -2170,7 +2168,7 @@ ExpandPercents(
 	     * This is used only by the MouseWheel event.
 	     */
 
-	    if (flags & KEY) {
+	    if ((flags & KEY) && (eventPtr->type == MouseWheelEvent)) {
 		number = eventPtr->xkey.keycode;
 		goto doNumber;
 	    }
@@ -2179,7 +2177,7 @@ ExpandPercents(
 	    number = (int) eventPtr->xany.send_event;
 	    goto doNumber;
 	case 'K':
-	    if (flags & KEY) {
+	    if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) {
 		const char *name = TkKeysymToString(keySym);
 
 		if (name != NULL) {
@@ -2188,7 +2186,7 @@ ExpandPercents(
 	    }
 	    goto doString;
 	case 'N':
-	    if (flags & KEY) {
+	    if ((flags & KEY) && (eventPtr->type != MouseWheelEvent)) {
 		number = (int) keySym;
 		goto doNumber;
 	    }
@@ -2228,33 +2226,19 @@ ExpandPercents(
 	}
 	case 'X':
 	    if (flags & KEY_BUTTON_MOTION_CROSSING) {
-		Tk_Window tkwin;
-		int x, y;
-		int width, height;
 
 		number = eventPtr->xkey.x_root;
-		tkwin = Tk_IdToWindow(eventPtr->xany.display,
+		Tk_IdToWindow(eventPtr->xany.display,
 			eventPtr->xany.window);
-		if (tkwin != NULL) {
-		    Tk_GetVRootGeometry(tkwin, &x, &y, &width, &height);
-		    number -= x;
-		}
 		goto doNumber;
 	    }
 	    goto doString;
 	case 'Y':
 	    if (flags & KEY_BUTTON_MOTION_CROSSING) {
-		Tk_Window tkwin;
-		int x, y;
-		int width, height;
 
 		number = eventPtr->xkey.y_root;
-		tkwin = Tk_IdToWindow(eventPtr->xany.display,
+		Tk_IdToWindow(eventPtr->xany.display,
 			eventPtr->xany.window);
-		if (tkwin != NULL) {
-		    Tk_GetVRootGeometry(tkwin, &x, &y, &width, &height);
-		    number -= y;
-		}
 		goto doNumber;
 	    }
 	    goto doString;