diff options
author | dgp <dgp@users.sourceforge.net> | 2016-02-09 18:43:52 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2016-02-09 18:43:52 (GMT) |
commit | 77c0bc32154c03e49b39ad66e676999e29b66a2c (patch) | |
tree | da2ea54eebc27b5b2601fd217019bc0eae04c6c2 /tests | |
parent | b2bb8f7366e971a698d64610c5d30fa31f414ca1 (diff) | |
parent | 8f151700b10bf8811876305e284738707d4ad237 (diff) | |
download | tk-77c0bc32154c03e49b39ad66e676999e29b66a2c.zip tk-77c0bc32154c03e49b39ad66e676999e29b66a2c.tar.gz tk-77c0bc32154c03e49b39ad66e676999e29b66a2c.tar.bz2 |
merge trunk
Diffstat (limited to 'tests')
-rw-r--r-- | tests/entry.test | 6 | ||||
-rwxr-xr-x | tests/option.file3 | 2 | ||||
-rw-r--r-- | tests/textDisp.test | 19 |
3 files changed, 13 insertions, 14 deletions
diff --git a/tests/entry.test b/tests/entry.test index 9c30b00..4f09450 100644 --- a/tests/entry.test +++ b/tests/entry.test @@ -1074,7 +1074,7 @@ test entry-3.42 {EntryWidgetCmd procedure, "scan" widget command} -setup { } -body { .e scan a } -cleanup { - destroy .e + destroy .efixed } -returnCodes error -result {wrong # args: should be ".e scan mark|dragto x"} test entry-3.43 {EntryWidgetCmd procedure, "scan" widget command} -setup { entry .e @@ -1896,12 +1896,12 @@ test entry-6.12 {EntryComputeGeometry procedure} -constraints { fonts } -setup { catch {destroy .e} - entry .e -font $fixed -bd 2 -relief raised -width 20 + entry .e -font {Courier -12} -bd 2 -relief raised -width 20 pack .e } -body { .e insert end "012\t456\t" update - list [.e index @81] [.e index @82] [.e index @116] [.e index @117] + list [.e index @80] [.e index @81] [.e index @115] [.e index @116] } -cleanup { destroy .e } -result {6 7 7 8} diff --git a/tests/option.file3 b/tests/option.file3 index 87f41ae..146cfd9 100755 --- a/tests/option.file3 +++ b/tests/option.file3 @@ -1,4 +1,4 @@ -! This file is a sample option (resource) database used to test +! This file is a sample option (resource) database used to test ! Tk's option-handling capabilities. ! Comment line \ diff --git a/tests/textDisp.test b/tests/textDisp.test index caba769..353999f 100644 --- a/tests/textDisp.test +++ b/tests/textDisp.test @@ -1181,16 +1181,15 @@ test textDisp-8.12 {TkTextChanged, moving the insert cursor redraws only past an .t mark set insert 3.8 ; # within the same line update lappend res $tk_textRedraw - # This last one is tricky: correct result really is {2.0 3.0} when - # calling .t mark set insert, two calls to TkTextChanged are done: - # (a) to redraw the line of the past position of the cursor - # (b) to redraw the line of the new position of the cursor - # During (a) the display line showing the cursor gets unlinked, - # which leads TkTextChanged in (b) to schedule a redraw starting - # one line _before_ the line containing the insert cursor. This is - # because during (b) findDLine cannot return the display line the - # cursor is in since this display line was just unlinked in (a). -} {{8.0 9.0} {8.0 12.0} {8.0 12.0} {3.0 8.0} {2.0 3.0}} +} {{8.0 9.0} {8.0 12.0} {8.0 12.0} {3.0 8.0} {3.0 4.0}} +test textDisp-8.13 {TkTextChanged, used to crash, see [06c1433906]} { + .t delete 1.0 end + .t insert 1.0 \nLine2\nLine3\n + update + .t insert 3.0 "" + .t delete 1.0 2.0 + update idletasks +} {} test textDisp-9.1 {TkTextRedrawTag} { .t configure -wrap char |