summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorKevin Walzer <kw@codebykevin.com>2012-10-02 00:45:42 (GMT)
committerKevin Walzer <kw@codebykevin.com>2012-10-02 00:45:42 (GMT)
commitba783367aeb76fb86aec2e5fd8dd4c2012277d51 (patch)
tree7c186710f13ed6b1bdde498606f66a7433dbbfbc /tests
parentccdd8d3ab00162ae1628413134fbda50e17212e9 (diff)
downloadtk-ba783367aeb76fb86aec2e5fd8dd4c2012277d51.zip
tk-ba783367aeb76fb86aec2e5fd8dd4c2012277d51.tar.gz
tk-ba783367aeb76fb86aec2e5fd8dd4c2012277d51.tar.bz2
Backport of dgp fixes on 50e0c049b2 to 8.5
Diffstat (limited to 'tests')
-rw-r--r--tests/winWm.test23
1 files changed, 13 insertions, 10 deletions
diff --git a/tests/winWm.test b/tests/winWm.test
index 2864418..933d09e 100644
--- a/tests/winWm.test
+++ b/tests/winWm.test
@@ -465,23 +465,26 @@ test winWm-9.2 "check wm forget for unmapped parent (#3205464,#2967911)" -setup
frame .t.f -background blue -height 200 -width 200
frame .t.f.x -background red -height 100 -width 100
} -body {
- pack .t.f.x
+ pack .t.f.x
pack .t.f
- set aid [after 1000 {set ::winwm92 timeout}]
- after 100 {
+ lappend aid [after 2000 {set ::winwm92 timeout}] [after 100 {
wm manage .t.f
wm iconify .t
- after 100 {
+ lappend aid [after 100 {
wm forget .t.f
wm deiconify .t
- after 100 {
+ lappend aid [after 100 {
pack .t.f
- after 100 {set ::winwm92 [expr {[winfo rooty .t.f.x] == 0 ? "failed" : "ok"}]}
- }
- }
- }
+ lappend aid [after 100 {
+ set ::winwm92 [expr {
+ [winfo rooty .t.f.x] == 0 ? "failed" : "ok"}]}]
+ }]
+ }]
+ }]
vwait ::winwm92
- after cancel $aid
+ foreach id $aid {
+ after cancel $id
+ }
set winwm92
} -cleanup {
destroy .t.f.x .t.f .t