Updated to tk 8.4.1

[pf3gnuchains/sourceware.git] / tk / tests / textDisp.test

diff --git a/tk/tests/textDisp.test b/tk/tests/textDisp.test
index 95d3e90..dd91c2c 100644 (file)
--- a/tk/tests/textDisp.test
+++ b/tk/tests/textDisp.test
@@ -8,12 +8,16 @@
 #
 # RCS: @(#) $Id$
 
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    source [file join [pwd] [file dirname [info script]] defs.tcl]
-}
-if {$::tcltest::testConfig(fonts) == 0} {
-    puts "skipping font-sensitive tests"
-}
+package require tcltest 2.1
+namespace import -force tcltest::configure
+namespace import -force tcltest::testsDirectory
+configure -testdir [file join [pwd] [file dirname [info script]]]
+configure -loadfile [file join [testsDirectory] constraints.tcl]
+tcltest::loadTestedCommands
+
+namespace import -force tcltest::interpreter
+namespace import -force tcltest::makeFile
+namespace import -force tcltest::removeFile
 
 # The procedure below is used as the scrolling command for the text;
 # it just saves the scrolling information in a variable "scrollInfo".
@@ -40,17 +44,10 @@ option add *Text.highlightThickness 2
 # because some window managers don't allow the overall width of a window
 # to get very narrow.
 
-foreach i [winfo child .] {
-    destroy $i
-}
 frame .f -width 100 -height 20
 pack append . .f left
 
-if {$tcl_platform(platform) == "windows"} {
-    set fixedFont {Courier -14}
-} else {
-    set fixedFont {Courier -12}
-}
+set fixedFont {Courier -12}
 set fixedHeight [font metrics $fixedFont -linespace]
 set fixedWidth [font measure $fixedFont m]
 
@@ -557,7 +554,7 @@ test textDisp-4.11 {UpdateDisplayInfo, filling in extra vertical space} {
 } {6.40 {13.0 7.0 6.80 6.60 6.40} {6.40 6.60 6.80 7.0 13.0}}
 test textDisp-4.12 {UpdateDisplayInfo, filling in extra vertical space} {
     .t delete 1.0 end
-    .t insert end "1\n2\n3\n4\n5\n7\n8\n9\n10\n11\n12"
+    .t insert end "1\n2\n3\n4\n5\n7\n8\n9\n10\n11\n12\n13"
     button .b -text "Test" -bd 2 -highlightthickness 2
     .t window create 3.end -window .b
     .t yview moveto 1
@@ -2861,24 +2858,9 @@ test textDisp-29.3 {miscellaneous: lines wrap but are still too long} {fonts} {
     list [.t2.t xview] [winfo geom .t2.t.f] [.t2.t bbox 1.3]
 } {{0.536667 1} 300x50+-156+18 {}}
 
-foreach i [winfo children .] {
-    catch {destroy $i}
-}
+deleteWindows
 option clear
 
 # cleanup
 ::tcltest::cleanupTests
 return
-
-
-
-
-
-
-
-
-
-
-
-
-