merge 8.6

2 files changed, 13 insertions, 12 deletions

diff --git a/tests/canvRect.test b/tests/canvRect.test
index f5772e5..1aa5421 100644
--- a/tests/canvRect.test
+++ b/tests/canvRect.test
@@ -167,16 +167,21 @@ test canvRect-4.4 {ConfigureRectOval procedure} -body {
 
 # I can't come up with any good tests for DeleteRectOval.
 
-test canvRect-5.1 {ComputeRectOvalBbox procedure} -constraints nonPortable -body {
-    # Non-portable due to rounding differences:
+# On Windows the bbox of rectangle items is 1 pixel larger at each border due
+# to the "bloat" implemented in ComputeRectOvalBbox() in case -outline is {}
+if {[tk windowingsystem] eq "win32"} {
+    set result_5_1 {9 4 21 16}
+} else {
+    set result_5_1 {10 5 20 15}
+}
+test canvRect-5.1 {ComputeRectOvalBbox procedure} -body {
     .c create rectangle 10 20 30 40 -tags x -width 1 -outline {}
     .c coords x 20 15 10 5
     .c bbox x
 } -cleanup {
     .c delete withtag all
-} -result {10 5 20 15}
-test canvRect-5.2 {ComputeRectOvalBbox procedure} -constraints nonPortable -body {
-    # Non-portable due to rounding differences:
+} -result $result_5_1
+test canvRect-5.2 {ComputeRectOvalBbox procedure} -body {
     .c create rectangle 10 20 30 40 -tags x -width 1 -outline {}
     .c coords x 10 20 30 10
     .c itemconfigure x -width 1 -outline red
@@ -184,8 +189,7 @@ test canvRect-5.2 {ComputeRectOvalBbox procedure} -constraints nonPortable -body
 } -cleanup {
     .c delete withtag all
 } -result {9 9 31 21}
-test canvRect-5.3 {ComputeRectOvalBbox procedure} -constraints nonPortable -body {
-    # Non-portable due to rounding differences:
+test canvRect-5.3 {ComputeRectOvalBbox procedure} -body {
     .c create rectangle 10 20 30 40 -tags x -width 1 -outline {}
     .c coords x 10 20 30 10
     .c itemconfigure x -width 2 -outline red
@@ -193,8 +197,7 @@ test canvRect-5.3 {ComputeRectOvalBbox procedure} -constraints nonPortable -body
 } -cleanup {
     .c delete withtag all
 } -result {9 9 31 21}
-test canvRect-5.4 {ComputeRectOvalBbox procedure} -constraints nonPortable -body {
-    # Non-portable due to rounding differences:
+test canvRect-5.4 {ComputeRectOvalBbox procedure} -body {
     .c create rectangle 10 20 30 40 -tags x -width 1 -outline {}
     .c coords x 10 20 30 10
     .c itemconfigure x -width 3 -outline red
diff --git a/tests/grid.test b/tests/grid.test
index dd02729..a668b45 100644
--- a/tests/grid.test
+++ b/tests/grid.test
@@ -366,9 +366,7 @@ test grid-6.8 {location (weights)} -body {
 } -cleanup {
     grid_reset 6.8
 } -result {{-10->-1 -1} {0->0 0} {16->0 1} {201->1 1}}
-test grid-6.9 {location: check updates pending} -constraints {
-    nonPortable
-} -body {
+test grid-6.9 {location: check updates pending} -body {
     set a ""
     foreach i {0 1 2} {
 	frame .$i -width 120 -height 75 -bg red