diff options
| author | culler <culler> | 2024-06-26 03:46:04 (GMT) |
|---|---|---|
| committer | culler <culler> | 2024-06-26 03:46:04 (GMT) |
| commit | f7a502702be5e43b4215f77dcf710b166537193a (patch) | |
| tree | 004ca8c016e2cab6d92614a876dd6f3f45668405 | |
| parent | 468bf9b8df08c68927e81183d6ece4c3a91c2887 (diff) | |
| download | tk-f7a502702be5e43b4215f77dcf710b166537193a.zip tk-f7a502702be5e43b4215f77dcf710b166537193a.tar.gz tk-f7a502702be5e43b4215f77dcf710b166537193a.tar.bz2 | |
Still fighting with unixWm.
| -rw-r--r-- | macosx/tkMacOSXSubwindows.c | 9 | ||||
| -rw-r--r-- | tests/unixWm.test | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index 2714de8..771497c 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -193,12 +193,13 @@ XMapWindow( } /* - * Delay for up to 20 milliseconds until the toplevel has actually become the - * highest toplevel. This is to ensure that the Visibility event occurs after - * the toplevel is visible. + * Delay for up to 20 milliseconds until the toplevel has + * actually become the highest toplevel. This is to ensure + * that the Visibility event occurs after the toplevel is + * visible. */ - for (int count = 0; count < 20; count++) { + for (int try = 0; try < 20; try++) { if ([[NSApp orderedWindows] firstObject] == win) { break; } diff --git a/tests/unixWm.test b/tests/unixWm.test index 4a88fd1..e70242d 100644 --- a/tests/unixWm.test +++ b/tests/unixWm.test @@ -1971,13 +1971,16 @@ test unixWm-50.9 {Tk_CoordsToWindow procedure, unmapped windows} {unix failsOnUb toplevel .t -width 200 -height 200 -bg green tkwait visibility .t wm geometry .t +20+20 + after 200 update toplevel .t2 -width 200 -height 200 -bg red tkwait visibility .t2 wm geometry .t2 +20+20 + after 200 update set result [list [winfo containing 120 120]] destroy .t2 + after 200 update lappend result [winfo containing 120 120] } {.t2 .t} @@ -2065,10 +2068,10 @@ test unixWm-51.6 {TkWmRestackToplevel procedure, window to be stacked isn't mapp test unixWm-51.7 {TkWmRestackToplevel procedure, other window isn't mapped} {unix failsOnXQuarz} { foreach w {.t .t2 .t3} { destroy $w - update toplevel $w -width 200 -height 200 -bg green tkwait visibility $w wm geometry $w +100+100 + after 200 update } update |