Fix Windows tests which were affected by the Mac changes.

1 files changed, 11 insertions, 7 deletions

diff --git a/tests/pack.test b/tests/pack.test
index 04e84b9..86fcad2 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1549,12 +1549,19 @@ test pack-17.2 {PackLostSlaveProc procedure} -setup {
     pack info .pack.a
 } -returnCodes error -result {window ".pack.a" isn't packed}
 
+if {[tk windowingsystem] == "win32"} {
+    proc packUpdate {} {
+	update
+    }
+} else {
+    proc packUpdate {} {
+    }
+}
 
 test pack-18.1 {unmap slaves when master unmapped} -constraints {
     tempNotPc
 } -setup {
     eval destroy [winfo child .pack]
-    update idletasks
 } -body {
 
     # adjust the position of .pack before test to avoid a screen switch
@@ -1562,29 +1569,27 @@ test pack-18.1 {unmap slaves when master unmapped} -constraints {
     # as the screen (screen switch causes scale and other tests to fail).
 
     wm geometry .pack +100+100
-    update idletasks
 
     # On the PC, when the width/height is configured while the window is
     # unmapped, the changes don't take effect until the window is remapped.
     # Who knows why?
 
     eval destroy [winfo child .pack]
-    update idletasks
     frame .pack.a -width 100 -height 50 -relief raised -bd 2
     pack .pack.a
     update idletasks
     set result [winfo ismapped .pack.a]
     wm iconify .pack
-    update idletasks
     lappend result [winfo ismapped .pack.a]
     .pack.a configure -width 200 -height 75
     update idletasks
     lappend result [winfo width .pack.a ] [winfo height .pack.a] \
     [winfo ismapped .pack.a]
     wm deiconify .pack
-    update idletasks
+    packUpdate
     lappend result [winfo ismapped .pack.a]
 } -result {1 0 200 75 0 1}
+
 test pack-18.2 {unmap slaves when master unmapped} -setup {
     eval destroy [winfo child .pack]
 } -body {
@@ -1601,14 +1606,13 @@ test pack-18.2 {unmap slaves when master unmapped} -setup {
     update idletasks
     set result [winfo ismapped .pack.b]
     wm iconify .pack
-    update idletasks
     lappend result [winfo ismapped .pack.b]
     .pack.b configure -width 100 -height 30
     update idletasks
     lappend result [winfo width .pack.b ] [winfo height .pack.b] \
     [winfo ismapped .pack.b]
     wm deiconify .pack
-    update idletasks
+    packUpdate
     lappend result [winfo ismapped .pack.b]
 } -result {1 0 100 30 0 1}