diff options
Diffstat (limited to 'tk/tests/scale.test')
| -rw-r--r-- | tk/tests/scale.test | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/tk/tests/scale.test b/tk/tests/scale.test index 73d21846785..a6271ab7037 100644 --- a/tk/tests/scale.test +++ b/tk/tests/scale.test @@ -8,15 +8,12 @@ # # RCS: @(#) $Id$ -if {[lsearch [namespace children] ::tcltest] == -1} { - source [file join [pwd] [file dirname [info script]] defs.tcl] -} - -foreach i [winfo children .] { - destroy $i -} -wm geometry . {} -raise . +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 # Create entries in the option database to be sure that geometry options # like border width have predictable values. @@ -618,7 +615,7 @@ test scale-11.1 {ScaleEventProc procedure} { set x } {initial 1 0 {}} test scale-11.2 {ScaleEventProc procedure} { - eval destroy [winfo children .] + deleteWindows scale .s1 -bg #543210 rename .s1 .s2 set x {} @@ -629,7 +626,7 @@ test scale-11.2 {ScaleEventProc procedure} { } {.s1 #543210 {} {}} test scale-12.1 {ScaleCmdDeletedProc procedure} { - eval destroy [winfo children .] + deleteWindows scale .s1 rename .s1 {} list [info command .s*] [winfo children .] @@ -786,7 +783,7 @@ test scale-15.6 {ScaleVarProc procedure, don't call -command} { } {untouched 60} set l [interp hidden] -eval destroy [winfo children .] +deleteWindows test scale-16.1 {scale widget vs hidden commands} { catch {destroy .s} @@ -826,4 +823,3 @@ option clear # cleanup ::tcltest::cleanupTests return - |