summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tests/focusTcl.test8
-rw-r--r--tests/pack.test4
-rw-r--r--tests/text.test30
-rw-r--r--tests/textDisp.test6
-rw-r--r--tests/textIndex.test6
-rw-r--r--tests/textMark.test2
-rw-r--r--tests/textTag.test2
-rw-r--r--tests/textWind.test2
8 files changed, 30 insertions, 30 deletions
diff --git a/tests/focusTcl.test b/tests/focusTcl.test
index ef848bb..0e457a6 100644
--- a/tests/focusTcl.test
+++ b/tests/focusTcl.test
@@ -402,7 +402,7 @@ test focusTcl-5.4 {tkFocusOK procedure, -takefocus ""} -body {
test focusTcl-5.5 {tkFocusOK procedure, -takefocus "", not mapped} -body {
setup1 .
.b.x configure -takefocus ""
- pack unpack .b.x
+ pack forget .b.x
update
tk_focusNext .b
} -cleanup {
@@ -413,7 +413,7 @@ test focusTcl-5.6 {tkFocusOK procedure, -takefocus "", not mapped} -body {
foreach w {.b.x .b.y .b.z} {
$w configure -takefocus ""
}
- pack unpack .b
+ pack forget .b
update
tk_focusNext .b
} -cleanup {
@@ -422,7 +422,7 @@ test focusTcl-5.6 {tkFocusOK procedure, -takefocus "", not mapped} -body {
test focusTcl-5.7 {tkFocusOK procedure, -takefocus "", not mapped} -body {
setup1 .
.b.y configure -takefocus 1
- pack unpack .b.y
+ pack forget .b.y
update
tk_focusNext .b.x
} -cleanup {
@@ -432,7 +432,7 @@ test focusTcl-5.8 {tkFocusOK procedure, -takefocus "", not mapped} -body {
proc always args {return 1}
setup1 .
.b.y configure -takefocus always
- pack unpack .b.y
+ pack forget .b.y
update
tk_focusNext .b.x
} -cleanup {
diff --git a/tests/pack.test b/tests/pack.test
index eac1562..efb262b 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1403,7 +1403,7 @@ test pack-15.1 {managing geometry with -in option} -setup {
pack .pack.b -in .pack.f.f2
update
set result [winfo geom .pack.b]
- pack unpack .pack.a
+ pack forget .pack.a
update
lappend result [winfo geom .pack.b]
} -cleanup {
@@ -1441,7 +1441,7 @@ test pack-15.3 {managing geometry with -in option} -setup {
pack .pack.b -in .pack.f.f2
update
set result [winfo ismapped .pack.b]
- pack unpack .pack.f
+ pack forget .pack.f
update
lappend result [winfo ismapped .pack.b]
} -cleanup {
diff --git a/tests/text.test b/tests/text.test
index 6812855..edd2a6e 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -2631,7 +2631,7 @@ test text-10.37 {TextWidgetCmd procedure, "count" option} -setup {
} -result {3}
test text-10.38 {TextWidgetCmd procedure, "count" option} -setup {
text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
- pack append . .t {top expand fill}
+ pack .t -expand 1 -fill both
} -body {
.t configure -width 20 -height 10
update
@@ -2727,7 +2727,7 @@ test text-9.2.47 {TextWidgetCmd procedure, "count" option} -setup {
test text-11.1 {counting with tag priority eliding} -setup {
text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
- pack append . .t {top expand fill}
+ pack .t -expand 1 -fill both
} -body {
.t insert end "hello"
.t configure -wrap none
@@ -2744,7 +2744,7 @@ test text-11.1 {counting with tag priority eliding} -setup {
} -result {0 1 2 3 4 5 5 6}
test text-11.2 {counting with tag priority eliding} -setup {
text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
- pack append . .t {top expand fill}
+ pack .t -expand 1 -fill both
} -body {
.t insert end "hello"
.t tag configure elide1 -elide 0
@@ -2856,7 +2856,7 @@ test text-11.7 {counting with tag priority eliding} -setup {
} -result {5 5}
test text-11.8 {counting with tag priority eliding} -setup {
text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
- pack append . .t {top expand fill}
+ pack .t -expand 1 -fill both
set res {}
} -body {
.t insert end "hello"
@@ -2882,7 +2882,7 @@ test text-11.8 {counting with tag priority eliding} -setup {
} -result {0 0 0 0 3 2 1 1}
test text-11.9 {counting with tag priority eliding} -setup {
text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
- pack append . .t {top expand fill}
+ pack .t -expand 1 -fill both
set res {}
} -body {
.t tag configure WELCOME -elide 1
@@ -3432,7 +3432,7 @@ test text-14.18 {ConfigureText procedure} -constraints fonts -setup {
text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
} -body {
.top.t configure -width 20 -height 10
- pack append .top .top.t top
+ pack .top.t
update
set geom [wm geometry .top]
set x [string range $geom 0 [string first + $geom]]
@@ -3449,7 +3449,7 @@ test text-14.19 {ConfigureText procedure} -setup {
} -body {
.top.t configure -width 20 -height 10 -setgrid 1
wm overrideredirect .top 1
- pack append .top .top.t top
+ pack .top.t
wm geometry .top +0+0
update
wm geometry .top
@@ -3466,7 +3466,7 @@ test text-14.20 {ConfigureText procedure} -setup {
} -body {
.top.t configure -width 20 -height 10 -setgrid 1
wm overrideredirect .top 1
- pack append .top .top.t top
+ pack .top.t
wm geometry .top +0+0
update
set result [wm geometry .top]
@@ -3756,7 +3756,7 @@ Line 4
test text-19.11 {DeleteChars procedure} -body {
toplevel .top
text .top.t -width 20 -height 5
- pack append .top .top.t top
+ pack .top.t
wm geometry .top +0+0
.top.t insert 1.0 "abc\n123\nx\ny\nz\nq\nr\ns"
update
@@ -3768,7 +3768,7 @@ test text-19.11 {DeleteChars procedure} -body {
test text-19.12 {DeleteChars procedure} -body {
toplevel .top
text .top.t -width 20 -height 5
- pack append .top .top.t top
+ pack .top.t
wm geometry .top +0+0
.top.t insert 1.0 "abc\n123\nx\ny\nz\nq\nr\ns"
.top.t yview 3.0
@@ -3841,7 +3841,7 @@ test text-19.16 {DeleteChars procedure, updates affecting topIndex} -setup {
test text-20.1 {TextFetchSelection procedure} -setup {
text .t -width 20 -height 10
- pack append . .t {top expand fill}
+ pack .t -expand 1 -fill both
update
} -body {
foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
@@ -3856,7 +3856,7 @@ b.0b.1b.2b.3b.4
c.0c}
test text-20.2 {TextFetchSelection procedure} -setup {
text .t -width 20 -height 10
- pack append . .t {top expand fill}
+ pack .t -expand 1 -fill both
update
} -body {
foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
@@ -3876,7 +3876,7 @@ b.0b.1b.2b.3b.4
c.0c}
test text-20.3 {TextFetchSelection procedure} -setup {
text .t -width 20 -height 10
- pack append . .t {top expand fill}
+ pack .t -expand 1 -fill both
update
} -body {
foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
@@ -3890,7 +3890,7 @@ test text-20.3 {TextFetchSelection procedure} -setup {
} -result {m}
test text-20.4 {TextFetchSelection procedure} -setup {
text .t -width 20 -height 10
- pack append . .t {top expand fill}
+ pack .t -expand 1 -fill both
update
} -body {
foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
@@ -3910,7 +3910,7 @@ test text-20.4 {TextFetchSelection procedure} -setup {
cj.0j.1j.2j.3j.4m}
test text-20.5 {TextFetchSelection procedure, long selections} -setup {
text .t -width 20 -height 10
- pack append . .t {top expand fill}
+ pack .t -expand 1 -fill both
update
set x ""
} -body {
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 8342c46..a3a4553 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -39,7 +39,7 @@ option add *Text.highlightThickness $twht
catch {destroy .f .t}
frame .f -width 100 -height 20
-pack append . .f left
+pack .f -side left
set fixedFont {Courier -12}
# 15 on XP, 13 on Solaris 8
@@ -65,7 +65,7 @@ set bigAscent [font metrics $bigFont -ascent]
set ascentDiff [expr {$bigAscent - $fixedAscent}]
text .t -font $fixedFont -width 20 -height 10 -yscrollcommand scroll
-pack append . .t {top expand fill}
+pack .t -expand 1 -fill both
.t tag configure big -font $bigFont
.t debug on
wm geometry . {}
@@ -599,7 +599,7 @@ test textDisp-4.6 {UpdateDisplayInfo, tiny window} {
wm overrideredirect . 1
}
frame .f2 -width 20 -height 100
- pack before .f .f2 top
+ pack .f2 -before .f
wm geom . 103x103
update
.t configure -wrap none -borderwidth 2
diff --git a/tests/textIndex.test b/tests/textIndex.test
index 83a249e..7d44516 100644
--- a/tests/textIndex.test
+++ b/tests/textIndex.test
@@ -13,7 +13,7 @@ namespace import -force tcltest::test
catch {destroy .t}
text .t -font {Courier -12} -width 20 -height 10
-pack append . .t {top expand fill}
+pack .t -expand 1 -fill both
update
.t debug on
wm geometry . {}
@@ -714,7 +714,7 @@ test textIndex-18.1 {Object indices don't cache mark names} {
} {3.4 3.0 1.0}
frame .f -width 100 -height 20
-pack append . .f left
+pack .f -side left
set fixedFont {Courier -12}
set fixedHeight [font metrics $fixedFont -linespace]
@@ -724,7 +724,7 @@ set varFont {Times -14}
set bigFont {Helvetica -24}
destroy .t
text .t -font $fixedFont -width 20 -height 10 -wrap char
-pack append . .t {top expand fill}
+pack .t -expand 1 -fill both
.t tag configure big -font $bigFont
.t debug on
wm geometry . {}
diff --git a/tests/textMark.test b/tests/textMark.test
index edd0e92..bbf226e 100644
--- a/tests/textMark.test
+++ b/tests/textMark.test
@@ -13,7 +13,7 @@ tcltest::loadTestedCommands
destroy .t
text .t -width 20 -height 10
-pack append . .t {top expand fill}
+pack .t -expand 1 -fill both
update
.t debug on
wm geometry . {}
diff --git a/tests/textTag.test b/tests/textTag.test
index 88081d0..ddbaa3b 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -17,7 +17,7 @@ testConstraint haveCourier12 [expr {[catch {
.t configure -font {Courier 12}
}] == 0}]
-pack append . .t {top expand fill}
+pack .t -expand 1 -fill both
update
.t debug on
diff --git a/tests/textWind.test b/tests/textWind.test
index 27b7309..fd29e19 100644
--- a/tests/textWind.test
+++ b/tests/textWind.test
@@ -22,7 +22,7 @@ option add *Text.font {Courier -12}
deleteWindows
# Widget used in tests 1.* - 16.*
text .t -width 30 -height 6 -bd 2 -highlightthickness 2
-pack append . .t {top expand fill}
+pack .t -expand 1 -fill both
update
.t debug on
generated by cgit v0.12 at 2024-11-21 16:18:48 (GMT)