diff options
author | kevin_walzer <kevin_walzer@noemail.net> | 2012-10-02 00:45:42 (GMT) |
---|---|---|
committer | kevin_walzer <kevin_walzer@noemail.net> | 2012-10-02 00:45:42 (GMT) |
commit | 2d982d445b9403ebfb443a7b208b03138519f4a3 (patch) | |
tree | 7c186710f13ed6b1bdde498606f66a7433dbbfbc /tests | |
parent | 0e05afc74ec6f3a3290c65891035b53144284eb0 (diff) | |
download | tk-2d982d445b9403ebfb443a7b208b03138519f4a3.zip tk-2d982d445b9403ebfb443a7b208b03138519f4a3.tar.gz tk-2d982d445b9403ebfb443a7b208b03138519f4a3.tar.bz2 |
Backport of dgp fixes on 50e0c049b2 to 8.5
FossilOrigin-Name: 5b7f946912c4f9360d48c42572784079680f92d2
Diffstat (limited to 'tests')
-rw-r--r-- | tests/winWm.test | 23 |
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 |