summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorculler <culler>2020-06-01 21:34:36 (GMT)
committerculler <culler>2020-06-01 21:34:36 (GMT)
commitaeb89ef62c14b00be0853a7539e807bb3937a6f8 (patch)
tree22be887c989589854a6d45dc311e73c4a395ebd0 /tests
parent11b02278eef59eb2b8412727e92256477ea6188b (diff)
downloadtk-aeb89ef62c14b00be0853a7539e807bb3937a6f8.zip
tk-aeb89ef62c14b00be0853a7539e807bb3937a6f8.tar.gz
tk-aeb89ef62c14b00be0853a7539e807bb3937a6f8.tar.bz2
Better control over when drawRect runs. Add check for drawing outside of the drawRect clipping rectangle.
Diffstat (limited to 'tests')
-rw-r--r--tests/canvImg.test8
-rw-r--r--tests/image.test17
-rw-r--r--tests/listbox.test4
3 files changed, 6 insertions, 23 deletions
diff --git a/tests/canvImg.test b/tests/canvImg.test
index b60e384..1abea78 100644
--- a/tests/canvImg.test
+++ b/tests/canvImg.test
@@ -727,12 +727,6 @@ test canvImg-9.1 {DisplayImage procedure} -constraints testImageType -setup {
image delete foo
} -result {75 150 105 165}
-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}}
-}
test canvImg-10.1 {TranslateImage procedure} -constraints testImageType -setup {
.c delete all
update
@@ -750,7 +744,7 @@ test canvImg-10.1 {TranslateImage procedure} -constraints testImageType -setup {
} -cleanup {
.c delete all
image delete foo
-} -result $result_10_1
+} -result {{foo display 2 4 6 8}}
test canvImg-11.1 {TranslateImage procedure} -constraints testImageType -setup {
.c delete all
diff --git a/tests/image.test b/tests/image.test
index da65a66..cac304f 100644
--- a/tests/image.test
+++ b/tests/image.test
@@ -357,12 +357,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
@@ -385,13 +379,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
@@ -411,7 +400,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
diff --git a/tests/listbox.test b/tests/listbox.test
index 14c5c97..8d4ed33 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -2800,13 +2800,13 @@ test listbox-21.16 {ListboxListVarProc, update vertical scrollbar} -setup {
test listbox-22.1 {UpdateHScrollbar} -setup {
destroy .l
} -body {
- listbox .l -font $fixed -width 10 -xscrollcommand "record x"
set log {}
+ listbox .l -font $fixed -width 10 -xscrollcommand "record x"
pack .l
set timeout [after 500 {set log timeout}]
vwait log
.l insert end "0000000000"
- update
+ update idletasks
.l insert end "00000000000000000000"
vwait log
set log