diff options
| author | culler <culler> | 2017-12-05 15:51:53 (GMT) |
|---|---|---|
| committer | culler <culler> | 2017-12-05 15:51:53 (GMT) |
| commit | b50aa41fd509b6e0829da869f3e3fbd4f34e1307 (patch) | |
| tree | 70b2a8cebae6dbc73c981ae78728319ffddd5cdd /generic/tkBind.c | |
| parent | 2bf5f6b8191034e185f6bd6ea8cba07146900649 (diff) | |
| parent | de0eaeebac1635a66b66ca05dca003f1dad2243a (diff) | |
| download | tk-b50aa41fd509b6e0829da869f3e3fbd4f34e1307.zip tk-b50aa41fd509b6e0829da869f3e3fbd4f34e1307.tar.gz tk-b50aa41fd509b6e0829da869f3e3fbd4f34e1307.tar.bz2 | |
Merge core-8-6-branch into trunk. Fixes [1088805fff]. See [0feb63f139]
for explanations.
Diffstat (limited to 'generic/tkBind.c')
| -rw-r--r-- | generic/tkBind.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index e0cc1ca..839670a 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -1738,9 +1738,10 @@ MatchPatterns( } if (psPtr->flags & PAT_NEARBY) { XEvent *firstPtr = &bindPtr->eventRing[bindPtr->curEvent]; - int timeDiff; + long timeDiff; - timeDiff = (Time) firstPtr->xkey.time - eventPtr->xkey.time; + timeDiff = ((long)firstPtr->xkey.time - + (long)eventPtr->xkey.time); if ((firstPtr->xkey.x_root < (eventPtr->xkey.x_root - NEARBY_PIXELS)) || (firstPtr->xkey.x_root @@ -3333,9 +3334,9 @@ HandleEventGenerate( return TCL_ERROR; } if (flags & KEY_BUTTON_MOTION_CROSSING) { - event.general.xkey.time = (Time) number; + event.general.xkey.time = number; } else if (flags & PROP) { - event.general.xproperty.time = (Time) number; + event.general.xproperty.time = number; } else { goto badopt; } |