diff options
| author | marc_culler <marc.culler@gmail.com> | 2020-07-18 18:11:23 (GMT) |
|---|---|---|
| committer | marc_culler <marc.culler@gmail.com> | 2020-07-18 18:11:23 (GMT) |
| commit | 135c69972e594686104a8cda1c028c0b46e0f938 (patch) | |
| tree | 7bf68d0717cbe89738dba62d8df01fd95d34cba9 /tests/image.test | |
| parent | 3954d71d18d5d5aa61f21d4137726beb13a0047c (diff) | |
| parent | b63b41199525b0e3e0e95f65e6991f75f8e31dd5 (diff) | |
| download | tk-135c69972e594686104a8cda1c028c0b46e0f938.zip tk-135c69972e594686104a8cda1c028c0b46e0f938.tar.gz tk-135c69972e594686104a8cda1c028c0b46e0f938.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'tests/image.test')
| -rw-r--r-- | tests/image.test | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/tests/image.test b/tests/image.test index 31b7099..7eaa404 100644 --- a/tests/image.test +++ b/tests/image.test @@ -359,12 +359,6 @@ test image-8.1 {Tk_ImageCmd procedure, "inuse" option} -constraints { catch {destroy .b} } -result [list 0 1] -if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} { - # Aqua >= 10.14 will redraw the entire image in drawRect. - set result_9_1 {{foo display 0 0 30 15}} -} else { - set result_9_1 {{foo display 5 6 7 8}} -} test image-9.1 {Tk_ImageChanged procedure} -constraints testImageType -setup { .c delete all imageCleanup @@ -387,13 +381,8 @@ test image-9.1 {Tk_ImageChanged procedure} -constraints testImageType -setup { } -cleanup { .c delete all imageCleanup -} -result $result_9_1 -if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} { - # Aqua >= 10.14 will redraw the entire image. - set result_9_2 {{foo display 0 0 30 15} {foo display 0 0 30 15}} -} else { - set result_9_2 {{foo display 5 6 25 9} {foo display 0 0 12 14}} -} +} -result {{foo display 5 6 7 8}} + test image-9.2 {Tk_ImageChanged procedure} -constraints testImageType -setup { .c delete all imageCleanup @@ -413,7 +402,7 @@ test image-9.2 {Tk_ImageChanged procedure} -constraints testImageType -setup { } -cleanup { .c delete all imageCleanup -} -result $result_9_2 +} -result {{foo display 5 6 25 9} {foo display 0 0 12 14}} test image-10.1 {Tk_GetImage procedure} -setup { imageCleanup |