summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-11-16 13:54:24 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-11-16 13:54:24 (GMT)
commita92a3f7a813cacc0b0d67d4ff73f703e50dfbfa3 (patch)
tree773417367b87bc88800ed848ff0720a907d64c73 /tests
parent026e3c1a89685f0cc95502bfb70e6132128c1c58 (diff)
parenteaad06dfab9f12af40967edfef6a9a5348af92f2 (diff)
downloadtk-a92a3f7a813cacc0b0d67d4ff73f703e50dfbfa3.zip
tk-a92a3f7a813cacc0b0d67d4ff73f703e50dfbfa3.tar.gz
tk-a92a3f7a813cacc0b0d67d4ff73f703e50dfbfa3.tar.bz2
Merge core-8-5-branch
Diffstat (limited to 'tests')
-rw-r--r--tests/textDisp.test4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/textDisp.test b/tests/textDisp.test
index a6bbfd7..9c6af70 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -4104,7 +4104,7 @@ test textDisp-33.2 {one line longer than fits in the widget} {
.tt debug 1
set tk_textHeightCalc ""
.tt insert 1.0 [string repeat "more wrap + " 1]
- after 100 ; update
+ after 100 ; update idletasks
# Nothing should have been recalculated.
set tk_textHeightCalc
} {}
@@ -4184,7 +4184,7 @@ test textDisp-34.1 {Text widgets multi-scrolling problem: Bug 2677890} -setup {
return $result
} -cleanup {
destroy .t1 .sy
-} -result {{0.0 1.0} {0.0 1.0} {0.0 1.0} {0.0 0.24}}
+} -result {{0.0 0.24} {0.0 0.24} {0.0 0.24} {0.0 0.24}}
deleteWindows
option clear