diff options
| author | culler <culler> | 2019-05-21 18:29:39 (GMT) |
|---|---|---|
| committer | culler <culler> | 2019-05-21 18:29:39 (GMT) |
| commit | 98be79b4923b0a5ad357ec4aea70ba4e96317ef7 (patch) | |
| tree | f5f492e1002efd196b35f0411275293d9092088f /tests | |
| parent | e6a53ee519d926aee00a2a2d3288878f59fe4cac (diff) | |
| download | tk-98be79b4923b0a5ad357ec4aea70ba4e96317ef7.zip tk-98be79b4923b0a5ad357ec4aea70ba4e96317ef7.tar.gz tk-98be79b4923b0a5ad357ec4aea70ba4e96317ef7.tar.bz2 | |
On OSX 10.13 and earlier a different strategy is needed.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/canvImg.test | 8 | ||||
| -rw-r--r-- | tests/image.test | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/canvImg.test b/tests/canvImg.test index f2bea27..c28eb5b 100644 --- a/tests/canvImg.test +++ b/tests/canvImg.test @@ -721,8 +721,8 @@ test canvImg-9.1 {DisplayImage procedure} -constraints testImageType -setup { image delete foo } -result {75 150 105 165} -if {[tk windowingsystem] == "aqua"} { - # Aqua will redraw the entire image if the redraw occurs in drawRect. +if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} { + # Aqua >= 10.14 will redraw the entire image. set result_10_1 {{foo display 0 0 30 15}} } else { set result_10_1 {{foo display 2 4 6 8}} @@ -773,8 +773,8 @@ test canvImg-11.2 {ImageChangedProc procedure} -constraints { .c delete all image delete foo } -result {30 75 70 125} -if {[tk windowingsystem] == "aqua"} { - # Aqua will redraw the entire image if the redraw occurs in drawRect. +if {[tk windowingsystem] == "aqua" && $tcl_platform(osVersion) > 18} { + # Aqua >= 10.14 will redraw the entire image. set result_11_3 {{foo2 display 0 0 80 60}} } else { set result_11_3 {{foo2 display 0 0 20 40}} diff --git a/tests/image.test b/tests/image.test index 7744465..28adba3 100644 --- a/tests/image.test +++ b/tests/image.test @@ -363,8 +363,8 @@ test image-8.1 {Tk_ImageCmd procedure, "inuse" option} -constraints { catch {destroy .b} } -result [list 0 1] -if {[tk windowingsystem] == "aqua"} { - # Aqua will redraw the entire image if the redraw occurs in drawRect. +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}} @@ -385,8 +385,8 @@ test image-9.1 {Tk_ImageChanged procedure} -constraints testImageType -setup { .c delete all imageCleanup } -result $result_9_1 -if {[tk windowingsystem] == "aqua"} { - # Aqua will redraw the entire image if the redraw occurs in drawRect. +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}} |