Merge 8.6

1 files changed, 26 insertions, 26 deletions

diff --git a/tests/pack.test b/tests/pack.test
index be607d2..c878a28 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -868,28 +868,28 @@ test pack-9.1 {window ordering} -setup {
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -after .pack.b
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.a .pack.c .pack.d}
 test pack-9.2 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -after .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.b .pack.c .pack.d}
 test pack-9.3 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -before .pack.d
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c .pack.a .pack.d}
 test pack-9.4 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.d -before .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.d .pack.a .pack.b .pack.c}
 test pack-9.5 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -897,42 +897,42 @@ test pack-9.5 {window ordering} -setup {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack propagate .pack.c 0
     pack .pack.a -in .pack.c
-    list [pack slaves .pack] [pack slaves .pack.c]
+    list [pack content .pack] [pack content .pack.c]
 } -result {{.pack.b .pack.c .pack.d} .pack.a}
 test pack-9.6 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -in .pack
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c .pack.d .pack.a}
 test pack-9.7 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -padx 0
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.b .pack.c .pack.d}
 test pack-9.8 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c
     pack .pack.d
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.b .pack.c .pack.d}
 test pack-9.9 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d
     pack .pack.b .pack.d .pack.c -before .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.d .pack.c .pack.a}
 test pack-9.10 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d
     pack .pack.a .pack.c .pack.d .pack.b -after .pack.a
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.a .pack.c .pack.d .pack.b}
 
 test pack-10.1 {retaining/clearing configuration state} -setup {
@@ -952,14 +952,14 @@ test pack-10.2 {retaining/clearing configuration state} -setup {
     pack .pack.a -pady 14
     pack info .pack.a
 } -result {-in .pack -anchor n -expand 1 -fill both -ipadx 3 -ipady 4 -padx 1 -pady 14 -side bottom}
-test pack-10.3 {bad -in window does not change master} -setup {
+test pack-10.3 {bad -in window does not change container window} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     set result [list [winfo manager .pack.a]]
     catch {pack .pack.a -in .pack.a}
     lappend result [winfo manager .pack.a]
 } -result {{} {}}
-test pack-10.4 {bad -in window does not change master} -setup {
+test pack-10.4 {bad -in window does not change container window} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     winfo manager .pack.a
@@ -1134,7 +1134,7 @@ test pack-12.4 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack configure .pack.b .pack.c
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c}
 test pack-12.5 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -1298,7 +1298,7 @@ test pack-12.36 {command options and errors} -setup {
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d
     pack forget .pack.a .pack.d
-    pack slaves .pack
+    pack content .pack
 } -result {.pack.b .pack.c}
 test pack-12.37 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -1339,22 +1339,22 @@ test pack-12.41 {command options and errors} -setup {
 test pack-12.42 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves
+    pack content
 } -returnCodes error -result {wrong # args: should be "pack option arg ?arg ...?"}
 test pack-12.43 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves a b
-} -returnCodes error -result {wrong # args: should be "pack slaves window"}
+    pack content a b
+} -returnCodes error -result {wrong # args: should be "pack content window"}
 test pack-12.44 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves .x
+    pack content .x
 } -returnCodes error -result {bad window path name ".x"}
 test pack-12.45 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
-    pack slaves .pack.a
+    pack content .pack.a
 } -returnCodes ok -result {}
 test pack-12.46 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -1371,7 +1371,7 @@ test pack-13.1 {window deletion} -setup {
     update
     destroy .pack.d
     update
-    set result [list [pack slaves .pack] [winfo geometry .pack.a] \
+    set result [list [pack content .pack] [winfo geometry .pack.a] \
         [winfo geometry .pack.b] [winfo geometry .pack.c]]
 } -result {{.pack.right .pack.bottom .pack.a .pack.b .pack.c} 20x40+30+0 50x30+15+40 80x80+0+70}
 
@@ -1511,7 +1511,7 @@ test pack-16.1 {geometry manager name} -setup {
     lappend result [winfo manager .pack.a]
 } -result {{} pack {}}
 
-test pack-17.1 {PackLostSlaveProc procedure} -setup {
+test pack-17.1 {PackLostContentProc procedure} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a
@@ -1520,7 +1520,7 @@ test pack-17.1 {PackLostSlaveProc procedure} -setup {
     update
     list [winfo manager .pack.a] [winfo geometry .pack.a]
 } -result {place 20x40+40+10}
-test pack-17.2 {PackLostSlaveProc procedure} -setup {
+test pack-17.2 {PackLostContentProc procedure} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a
@@ -1541,7 +1541,7 @@ if {[tk windowingsystem] == "win32"} {
     }
 }
 
-test pack-18.1 {unmap slaves when master unmapped} -constraints {
+test pack-18.1 {unmap content when container unmapped} -constraints {
     tempNotPc
 } -setup {
     eval destroy [winfo child .pack]
@@ -1572,7 +1572,7 @@ test pack-18.1 {unmap slaves when master unmapped} -constraints {
     lappend result [winfo ismapped .pack.a]
 } -result {1 0 200 75 0 1}
 
-test pack-18.2 {unmap slaves when master unmapped} -setup {
+test pack-18.2 {unmap content when container unmapped} -setup {
     eval destroy [winfo child .pack]
 } -body {
     # adjust the position of .pack before test to avoid a screen switch
@@ -1598,7 +1598,7 @@ test pack-18.2 {unmap slaves when master unmapped} -setup {
 } -result {1 0 100 30 0 1}
 
 test pack-19.1 {test respect for internalborder} -setup {
-    catch {eval pack forget [pack slaves .pack]}
+    catch {eval pack forget [pack content .pack]}
     destroy .pack.l .pack.lf
 } -body {
     wm geometry .pack 200x200
@@ -1616,7 +1616,7 @@ test pack-19.1 {test respect for internalborder} -setup {
     destroy .pack.l .pack.lf
 } -result {196x188+2+10 177x186+5+7}
 test pack-19.2 {test support for minreqsize} -setup {
-    catch {eval pack forget [pack slaves .pack]}
+    catch {eval pack forget [pack content .pack]}
     destroy .pack.l .pack.lf
 } -body {
     wm geometry .pack {}