merge core-8-6-branch

1 files changed, 22 insertions, 11 deletions

diff --git a/tests/textTag.test b/tests/textTag.test
index 5761abc..d85037a 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -1488,7 +1488,8 @@ set y3 [expr {[lindex $c 1] + [lindex $c 3]/2}]
 
 test textTag-15.1 {TkTextBindProc} -constraints haveCourier12 -setup {
     .t tag delete x y
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    wm geometry . +200+200 ; update
+    event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
 } -body {
     bind .t <ButtonRelease> {lappend x up}
     .t tag bind x <ButtonRelease> {lappend x x-up}
@@ -1513,7 +1514,8 @@ test textTag-15.1 {TkTextBindProc} -constraints haveCourier12 -setup {
 
 test textTag-15.2 {TkTextBindProc} -constraints haveCourier12 -setup {
     .t tag delete x y
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    wm geometry . +200+200 ; update
+    event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
 } -body {
     .t tag bind x <Enter> {lappend x x-enter}
     .t tag bind x <ButtonPress> {lappend x x-down}
@@ -1541,7 +1543,8 @@ test textTag-15.2 {TkTextBindProc} -constraints haveCourier12 -setup {
 
 test textTag-15.3 {TkTextBindProc} -constraints haveCourier12 -setup {
     .t tag delete x y
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    wm geometry . +200+200 ; update
+    event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
 } -body {
     .t tag bind x <Enter> {lappend x x-enter}
     .t tag bind x <Any-ButtonPress-1> {lappend x x-down}
@@ -1576,7 +1579,8 @@ test textTag-16.1 {TkTextPickCurrent procedure} -constraints {
     haveCourier12 
 } -setup {
     .t tag delete {*}[.t tag names]
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    wm geometry . +200+200 ; update
+    event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
 } -body {
     event gen .t <ButtonRelease-1> -state 0x100 -x $x1 -y $y1
     set x [.t index current]
@@ -1598,7 +1602,8 @@ test textTag-16.2 {TkTextPickCurrent procedure} -constraints {
     haveCourier12 
 } -setup {
     .t tag delete {*}[.t tag names]
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    wm geometry . +200+200 ; update
+    event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
 } -body {
     .t tag configure big -font $bigFont
     event gen .t <ButtonRelease-1> -state 0x100 -x $x1 -y $y1
@@ -1617,7 +1622,8 @@ test textTag-16.3 {TkTextPickCurrent procedure} -constraints {
     foreach i {a b c d} {
         .t tag remove $i 1.0 end
     }
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    wm geometry . +200+200 ; update
+    event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
 } -body {
     foreach i {a b c d} {
         .t tag bind $i <Enter> "lappend x enter-$i"
@@ -1646,7 +1652,8 @@ test textTag-16.4 {TkTextPickCurrent procedure} -constraints {
     foreach i {a b c d} {
         .t tag remove $i 1.0 end
     }
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    wm geometry . +200+200 ; update
+    event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
 } -body {
     foreach i {a b c d} {
         .t tag bind $i <Enter> "lappend x enter-$i"
@@ -1674,7 +1681,8 @@ test textTag-16.5 {TkTextPickCurrent procedure} -constraints {
     foreach i {big a b c d} {
         .t tag remove $i 1.0 end
     }
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    wm geometry . +200+200 ; update
+    event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
 } -body {
     .t tag configure big -font $bigFont
     event gen .t <Motion> -x $x1 -y $y1
@@ -1692,7 +1700,8 @@ test textTag-16.6 {TkTextPickCurrent procedure} -constraints {
     foreach i {big a b c d} {
         .t tag remove $i 1.0 end
     }
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    wm geometry . +200+200 ; update
+    event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
 } -body {
     .t tag configure big -font $bigFont
     event gen .t <Motion> -x $x1 -y $y1
@@ -1711,7 +1720,8 @@ test textTag-16.7 {TkTextPickCurrent procedure} -constraints {
     foreach i {big a b c d} {
         .t tag remove $i 1.0 end
     }
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    wm geometry . +200+200 ; update
+    event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
 } -body {
     .t tag configure big -font $bigFont
     .t tag bind a <Enter> {.t tag add big 3.0 3.2}
@@ -1741,7 +1751,8 @@ test textTag-17.1 {insert procedure inserts tags} -setup {
 
 test textTag-18.1 {TkTextPickCurrent tag bindings} -setup {
     destroy .t
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    wm geometry . +200+200 ; update
+    event generate {} <Motion> -warp 1 -x 5 -y 5 ; update idletasks ; after 50
 } -body {
     text .t -width 30 -height 4 -relief sunken -borderwidth 10 \
       -highlightthickness 10 -pady 2