More alphabetizing Tk options. More type-cast improvements

10 files changed, 13 insertions, 13 deletions

diff --git a/tests/choosedir.test b/tests/choosedir.test
index 7e66756..5ddc2e7 100644
--- a/tests/choosedir.test
+++ b/tests/choosedir.test
@@ -102,7 +102,7 @@ test choosedir-1.5.1 {tk_chooseDirectory command} -constraints notAqua -body {
 } -returnCodes error -result {bad option "-foo": must be -initialdir, -mustexist, -parent, or -title}
 test choosedir-1.5.2 {tk_chooseDirectory command} -constraints aqua -body {
     tk_chooseDirectory -foo bar
-} -returnCodes error -result {bad option "-foo": must be -initialdir, -message, -mustexist, -parent, -title, or -command}
+} -returnCodes error -result {bad option "-foo": must be -command, -initialdir, -message, -mustexist, -parent, or -title}
 test choosedir-1.6 {tk_chooseDirectory command} -body {
     tk_chooseDirectory -parent foo.bar
 } -returnCodes error -result {bad window path name "foo.bar"}
diff --git a/tests/entry.test b/tests/entry.test
index cd26264..b7a5593 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -1115,7 +1115,7 @@ test entry-3.44 {EntryWidgetCmd procedure, "scan" widget command} -setup {
     .e scan foobar 20
 } -cleanup {
     destroy .e
-} -returnCodes error -result {bad scan option "foobar": must be mark or dragto}
+} -returnCodes error -result {bad scan option "foobar": must be dragto or mark}
 test entry-3.45 {EntryWidgetCmd procedure, "scan" widget command} -setup {
     entry .e
     pack .e ; update idletasks
diff --git a/tests/filebox.test b/tests/filebox.test
index cdf3224..f46c906 100644
--- a/tests/filebox.test
+++ b/tests/filebox.test
@@ -110,9 +110,9 @@ if {$tcl_platform(platform) == "unix"} {
 }
 
 set unknownOptionsMsg(tk_getOpenFile,notAqua) {bad option "-foo": must be -defaultextension, -filetypes, -initialdir, -initialfile, -multiple, -parent, -title, or -typevariable}
-set unknownOptionsMsg(tk_getOpenFile,aqua) {bad option "-foo": must be -defaultextension, -filetypes, -initialdir, -initialfile, -message, -multiple, -parent, -title, -typevariable, or -command}
+set unknownOptionsMsg(tk_getOpenFile,aqua) {bad option "-foo": must be -command, -defaultextension, -filetypes, -initialdir, -initialfile, -message, -multiple, -parent, -title, or -typevariable}
 set unknownOptionsMsg(tk_getSaveFile,notAqua) {bad option "-foo": must be -confirmoverwrite, -defaultextension, -filetypes, -initialdir, -initialfile, -parent, -title, or -typevariable}
-set unknownOptionsMsg(tk_getSaveFile,aqua) {bad option "-foo": must be -defaultextension, -filetypes, -initialdir, -initialfile, -message, -parent, -title, -typevariable, -command, or -confirmoverwrite}
+set unknownOptionsMsg(tk_getSaveFile,aqua) {bad option "-foo": must be -command, -confirmoverwrite, -defaultextension, -filetypes, -initialdir, -initialfile, -message, -parent, -title, or -typevariable}
 
 set tmpFile "filebox.tmp"
 makeFile {
diff --git a/tests/font.test b/tests/font.test
index dca3106..b4071d9 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -440,7 +440,7 @@ test font-10.4 {font command: metrics: arguments} -body {
 test font-10.5 {font command: metrics: arguments} -body {
     # (objc - skip) > 4) when skip == 2
     font metrics xyz -displayof . abc
-} -returnCodes error -result {bad metric "abc": must be -ascent, -descent, -linespace, or -fixed}
+} -returnCodes error -result {bad metric "abc": must be -ascent, -descent, -fixed, or -linespace}
 test font-10.6 {font command: metrics: bad font} -constraints noExceed -body {
     # (tkfont == NULL)
     font metrics "\{xyz"
@@ -457,7 +457,7 @@ test font-10.7 {font command: metrics: get all metrics} -setup {
 test font-10.8 {font command: metrics: bad metric} -body {
     # (Tcl_GetIndexFromObj() != TCL_OK)
     font metrics $fixed -xyz
-} -returnCodes error -result {bad metric "-xyz": must be -ascent, -descent, -linespace, or -fixed}
+} -returnCodes error -result {bad metric "-xyz": must be -ascent, -descent, -fixed, or -linespace}
 test font-10.9 {font command: metrics: get individual metrics} -body {
     font metrics $fixed -ascent
     font metrics $fixed -descent
diff --git a/tests/listbox.test b/tests/listbox.test
index f5418da..6b32297 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -816,7 +816,7 @@ test listbox-3.78 {ListboxWidgetCmd procedure, "scan" option} -constraints {
 } -result {{0.249364 0.427481} {0.0714286 0.428571}}
 test listbox-3.79 {ListboxWidgetCmd procedure, "scan" option} -body {
     .l scan foo 2 4
-} -returnCodes error -result {bad option "foo": must be mark or dragto}
+} -returnCodes error -result {bad option "foo": must be dragto or mark}
 test listbox-3.80 {ListboxWidgetCmd procedure, "see" option} -body {
     .l see
 } -returnCodes error -result {wrong # args: should be ".l see index"}
diff --git a/tests/menu.test b/tests/menu.test
index 85746b8..c18a274 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -3305,7 +3305,7 @@ test menu-20.5 {CloneMenu} -setup {
 } -body {
     menu .m1
     .m1 clone .m2 foo
-} -returnCodes error -result {bad menu type "foo": must be normal, tearoff, or menubar}
+} -returnCodes error -result {bad menu type "foo": must be menubar, normal, or tearoff}
 test menu-20.6 {CloneMenu - hooking up bookeeping ptrs} -setup {
     deleteWindows
 } -body {
@@ -4002,7 +4002,7 @@ test menu-39.1 {empty -type - bug be8f5b9fc2} -setup {
     menu .m -type {}
 } -cleanup {
     destroy .m
-} -returnCodes error -result {ambiguous type "": must be normal, tearoff, or menubar}
+} -returnCodes error -result {ambiguous type "": must be menubar, normal, or tearoff}
 
 
 # cleanup
diff --git a/tests/pack.test b/tests/pack.test
index a17de62..f85369d 100644
--- a/tests/pack.test
+++ b/tests/pack.test
@@ -1263,7 +1263,7 @@ test pack-12.29 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a -side bac
-} -returnCodes error -result {bad side "bac": must be top, bottom, left, or right}
+} -returnCodes error -result {bad side "bac": must be bottom, left, right, or top}
 test pack-12.30 {command options and errors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
diff --git a/tests/place.test b/tests/place.test
index 49edeb0..af54043 100644
--- a/tests/place.test
+++ b/tests/place.test
@@ -416,7 +416,7 @@ test place-10.3 {ConfigureContent} -setup {
     place .foo -bordermode j
 } -cleanup {
     destroy .foo
-} -returnCodes error -result {bad bordermode "j": must be inside, outside, or ignore}
+} -returnCodes error -result {bad bordermode "j": must be inside, ignore, or outside}
 test place-10.4 {ConfigureContent} -setup {
     destroy .foo
 } -body {
diff --git a/tests/spinbox.test b/tests/spinbox.test
index c73e31e..cf92877 100644
--- a/tests/spinbox.test
+++ b/tests/spinbox.test
@@ -1452,7 +1452,7 @@ test spinbox-3.44 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
     .e scan foobar 20
 } -cleanup {
     destroy .e
-} -returnCodes error -result {bad scan option "foobar": must be mark or dragto}
+} -returnCodes error -result {bad scan option "foobar": must be dragto or mark}
 test spinbox-3.45 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
     spinbox .e
     pack .e
diff --git a/tests/textDisp.test b/tests/textDisp.test
index da8c1d2..df72060 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -2371,7 +2371,7 @@ test textDisp-17.4 {TkTextScanCmd procedure} {
 } {1 {expected integer but got "bogus"}}
 test textDisp-17.5 {TkTextScanCmd procedure} {
     list [catch {.t scan stupid 123 456} msg] $msg
-} {1 {bad scan option "stupid": must be mark or dragto}}
+} {1 {bad scan option "stupid": must be dragto or mark}}
 test textDisp-17.6 {TkTextScanCmd procedure} {textfonts} {
     .t yview 1.0
     .t xview moveto 0