diff options
| author | culler <culler> | 2019-05-24 12:55:48 (GMT) |
|---|---|---|
| committer | culler <culler> | 2019-05-24 12:55:48 (GMT) |
| commit | b57f363874ccdfe7e2a449aef527d9f60885cf0c (patch) | |
| tree | b65cdbc36e0a8d5fbdf550caceea264017a29247 /tests | |
| parent | 4d732c5dd328c77dadb4a85a47e7f36cf8a4cb0b (diff) | |
| download | tk-b57f363874ccdfe7e2a449aef527d9f60885cf0c.zip tk-b57f363874ccdfe7e2a449aef527d9f60885cf0c.tar.gz tk-b57f363874ccdfe7e2a449aef527d9f60885cf0c.tar.bz2 | |
Fix bug [67384bce7d]: make winfo-13.2 expect the container to be destroyed in aqua and unix. Also disable unixEmbed-7.1a in aqua since TkpRedirectKeyEvent is not implemented.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unixEmbed.test | 4 | ||||
| -rw-r--r-- | tests/winfo.test | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test index a29995f..c2dc073 100644 --- a/tests/unixEmbed.test +++ b/tests/unixEmbed.test @@ -983,8 +983,10 @@ test unixEmbed-7.1 {TkpRedirectKeyEvent procedure, forward keystroke} -constrain deleteWindows bind . <KeyPress> {} } -result {{{key a 1}} {}} +# TkpRedirectKeyEvent is not implemented in win or aqua. If someone +# implements it they should change the constraints for this test. test unixEmbed-7.1a {TkpRedirectKeyEvent procedure, forward keystroke} -constraints { - unix + unix notAqua } -setup { deleteWindows catch {interp delete slave} diff --git a/tests/winfo.test b/tests/winfo.test index 14c2838..364948c 100644 --- a/tests/winfo.test +++ b/tests/winfo.test @@ -394,6 +394,13 @@ test winfo-13.1 {root coordinates of embedded toplevel} -setup { deleteWindows } -result {rootx 1 rooty 1} +# Windows does not destroy the container when an embedded window is +# destroyed. Unix and macOS do destroy it. See ticket [67384bce7d]. +if {[tk windowingsystem] == "win"} { + set result_13_2 {embedded 0 container 1} +} else { + set result_13_2 {embedded 0 container 0} +} test winfo-13.2 {destroying embedded toplevel} -setup { deleteWindows } -body { @@ -409,7 +416,7 @@ test winfo-13.2 {destroying embedded toplevel} -setup { list embedded [winfo exists .emb.b] container [winfo exists .con] } -cleanup { deleteWindows -} -result {embedded 0 container 1} +} -result $result_13_2 test winfo-13.3 {destroying container window} -setup { deleteWindows |