1 files changed, 9 insertions, 25 deletions
diff --git a/tests/pack.test b/tests/pack.test
index eac1562..df80562 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -62,7 +62,6 @@ test pack-1.4 {-side option} -setup {
     list [winfo geometry .pack.a] [winfo geometry .pack.b]
 } -result {20x40+280+80 280x200+0+0}
 
-
 test pack-2.1 {x padding and filling} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
@@ -251,7 +250,6 @@ test pack-2.23 {x padding and filling} -setup {
     expr {$res1 eq $res2}
 } -result 1
 
-
 test pack-3.1 {y padding and filling} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
@@ -440,7 +438,6 @@ test pack-3.23 {y padding and filling} -setup {
     expr {$res1 eq $res2}
 } -result 1
 
-
 test pack-4.1 {anchors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
@@ -591,7 +588,6 @@ test pack-5.9 {more anchors} -setup {
     winfo geometry .pack.b
 } -result {60x60+160+90}
 
-
 test pack-6.1 {-expand option} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
@@ -703,7 +699,7 @@ test pack-6.12 {-expand option} -setup {
     wm geometry .pack2 +0+0
     pack propagate .pack2 0
     foreach i {w1 w2 w3} {
-        frame .pack2.$i -width 30 -height 30 -bd 2 -relief raised
+        frame .pack2.$i -width 30 -height 30 -borderwidth 2 -relief raised
         label .pack2.$i.l -text $i
         place .pack2.$i.l -relwidth 1.0 -relheight 1.0
     }
@@ -719,7 +715,7 @@ test pack-6.13 {-expand option} -setup {
     wm geometry .pack2 +0+0
     pack propagate .pack2 0
     foreach i {w1 w2 w3} {
-        frame .pack2.$i -width 30 -height 30 -bd 2 -relief raised
+        frame .pack2.$i -width 30 -height 30 -borderwidth 2 -relief raised
         label .pack2.$i.l -text $i
         place .pack2.$i.l -relwidth 1.0 -relheight 1.0
     }
@@ -732,7 +728,6 @@ test pack-6.13 {-expand option} -setup {
     destroy .pack2
 } -result {38x42+181+45 38x42+181+178 38x42+181+312}
 
-
 wm geometry .pack {}
 test pack-7.1 {requesting size for parent} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
@@ -799,8 +794,8 @@ test pack-7.7 {requesting size for parent} -setup {
 # very small.
 
 pack forget .pack.a .pack.b .pack.c .pack.d
-frame .pack.right -width 200 -height 10 -bd 2 -relief raised
-frame .pack.bottom -width 10 -height 150 -bd 2 -relief raised
+frame .pack.right -width 200 -height 10 -borderwidth 2 -relief raised
+frame .pack.bottom -width 10 -height 150 -borderwidth 2 -relief raised
 pack .pack.right -side right
 pack .pack.bottom -side bottom
 pack .pack.a .pack.b .pack.c -side top
@@ -872,7 +867,6 @@ test pack-8.9 {insufficient space} -body {
 } -result {20x40+0+20 1 50x30+100+25 1 80x80+20+0 1}
 pack forget .pack.right .pack.bottom
 
-
 test pack-9.1 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
@@ -945,7 +939,6 @@ test pack-9.10 {window ordering} -setup {
     pack slaves .pack
 } -result {.pack.a .pack.c .pack.d .pack.b}
 
-
 test pack-10.1 {retaining/clearing configuration state} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
@@ -977,7 +970,6 @@ test pack-10.4 {bad -in window does not change master} -setup {
     pack .pack.a -in .pack.a
 } -returnCodes error -result {can't pack .pack.a inside itself}
 
-
 test pack-11.1 {info option} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
@@ -1112,7 +1104,6 @@ test pack-11.19 {info option} -setup {
     lindex $i [expr [lsearch -exact $i -side]+1]
 } -result right
 
-
 test pack-12.1 {command options and errors} -body {
     pack
 } -returnCodes error -result {wrong # args: should be "pack option arg ?arg ...?"}
@@ -1354,7 +1345,6 @@ test pack-12.46 {command options and errors} -setup {
     pack lousy .pack
 } -returnCodes error -result {bad option "lousy": must be configure, forget, info, propagate, or slaves}
 
-
 test pack-13.1 {window deletion} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d .pack.right .pack.bottom
 } -body {
@@ -1368,7 +1358,6 @@ test pack-13.1 {window deletion} -setup {
         [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}
 
-
 test pack-14.1 {respond to changes in expansion} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d .pack.right .pack.bottom
 } -body {
@@ -1388,7 +1377,6 @@ test pack-14.1 {respond to changes in expansion} -setup {
     wm geom .pack {}
 } -result {20x40+0+0 20x40+90+0 200x150+0+0}
 
-
 test pack-15.1 {managing geometry with -in option} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
     destroy .pack.f
@@ -1452,7 +1440,7 @@ test pack-15.4 {managing geometry with -in option} -setup {
     destroy .pack.f1 .pack.f2
 } -body {
     foreach i {1 2} {
-        frame .pack.f$i -width 100 -height 40 -bd 2 -relief raised
+        frame .pack.f$i -width 100 -height 40 -borderwidth 2 -relief raised
         lower .pack.f$i
         pack propagate .pack.f$i 0
         pack .pack.f$i -side top
@@ -1478,7 +1466,7 @@ test pack-15.5 {managing geometry with -in option} -setup {
     destroy .pack.f1 .pack.f2
 } -body {
     foreach i {1 2} {
-        frame .pack.f$i -width 100 -height 20 -bd 2 -relief raised
+        frame .pack.f$i -width 100 -height 20 -borderwidth 2 -relief raised
         lower .pack.f$i
         pack propagate .pack.f$i 0
         pack .pack.f$i -side top
@@ -1494,7 +1482,6 @@ test pack-15.5 {managing geometry with -in option} -setup {
     destroy .pack.f1 .pack.f2
 } -result {50x16+25+22 1 50x16+25+22 0}
 
-
 test pack-16.1 {geometry manager name} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
     set result {}
@@ -1506,7 +1493,6 @@ test pack-16.1 {geometry manager name} -setup {
     lappend result [winfo manager .pack.a]
 } -result {{} pack {}}
 
-
 test pack-17.1 {PackLostSlaveProc procedure} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
@@ -1528,7 +1514,6 @@ test pack-17.2 {PackLostSlaveProc procedure} -setup {
     pack info .pack.a
 } -returnCodes error -result {window ".pack.a" isn't packed}
 
-
 test pack-18.1 {unmap slaves when master unmapped} -constraints {
     tempNotPc
 } -setup {
@@ -1546,7 +1531,7 @@ test pack-18.1 {unmap slaves when master unmapped} -constraints {
     # Who knows why?
 
     eval destroy [winfo child .pack]
-    frame .pack.a -width 100 -height 50 -relief raised -bd 2
+    frame .pack.a -width 100 -height 50 -relief raised -borderwidth 2
     pack .pack.a
     update
     set result [winfo ismapped .pack.a]
@@ -1570,8 +1555,8 @@ test pack-18.2 {unmap slaves when master unmapped} -setup {
     # as the screen (screen switch causes scale and other tests to fail).
 
     wm geometry .pack +100+100
-    frame .pack.a -relief raised -bd 2
-    frame .pack.b -width 70 -height 30 -relief sunken -bd 2
+    frame .pack.a -relief raised -borderwidth 2
+    frame .pack.b -width 70 -height 30 -relief sunken -borderwidth 2
     pack .pack.a
     pack .pack.b -in .pack.a
     update
@@ -1588,7 +1573,6 @@ test pack-18.2 {unmap slaves when master unmapped} -setup {
     lappend result [winfo ismapped .pack.b]
 } -result {1 0 100 30 0 1}
 
-
 test pack-19.1 {test respect for internalborder} -setup {
     catch {eval pack forget [pack slaves .pack]}
     destroy .pack.l .pack.lf