diff options
| author | culler <culler@noemail.net> | 2017-12-03 04:20:38 (GMT) |
|---|---|---|
| committer | culler <culler@noemail.net> | 2017-12-03 04:20:38 (GMT) |
| commit | d31092e4090913af9e049496f597e2d66de358b2 (patch) | |
| tree | 44d063b1794ad512b5ae3be4a62c4bd4e2f16240 | |
| parent | b6fb23a58c4ee6f79efdacbe9e3e0f73f2d8e0c5 (diff) | |
| download | tk-d31092e4090913af9e049496f597e2d66de358b2.zip tk-d31092e4090913af9e049496f597e2d66de358b2.tar.gz tk-d31092e4090913af9e049496f597e2d66de358b2.tar.bz2 | |
Modify test bind-15.23 so the timestamps left over from bind-15.22 won't interfere.
FossilOrigin-Name: 0770962c35024b06d2c2cdfa0f64affdca72930f78ce078a5498b2b548c2145c
| -rw-r--r-- | generic/tkBind.c | 7 | ||||
| -rw-r--r-- | tests/bind.test | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/generic/tkBind.c b/generic/tkBind.c index 285b3f7..320b716 100644 --- a/generic/tkBind.c +++ b/generic/tkBind.c @@ -1740,7 +1740,8 @@ MatchPatterns( XEvent *firstPtr = &bindPtr->eventRing[bindPtr->curEvent]; int timeDiff; - timeDiff = (Time) firstPtr->xkey.time - eventPtr->xkey.time; + timeDiff = (int)((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; } diff --git a/tests/bind.test b/tests/bind.test index 03b9cb1..98f37ba 100644 --- a/tests/bind.test +++ b/tests/bind.test @@ -1400,14 +1400,13 @@ test bind-15.23 {MatchPatterns procedure, time wrap-around} -setup { } -body { bind .t.f <Double-1> {set x 1} set x 0 - event generate .t.f <Button-1> -time -100 - event generate .t.f <Button-1> -time 500 - event generate .t.f <ButtonRelease-1> + event generate .t.f <Button-1> -time 1000 + event generate .t.f <Button-1> -time 1600 + event generate .t.f <ButtonRelease-1> -time 1500 return $x } -cleanup { destroy .t.f } -result {0} - test bind-15.24 {MatchPatterns procedure, virtual event} -setup { frame .t.f -class Test -width 150 -height 100 pack .t.f |