diff options
Diffstat (limited to 'tests/entry.test')
| -rw-r--r-- | tests/entry.test | 204 |
1 files changed, 93 insertions, 111 deletions
diff --git a/tests/entry.test b/tests/entry.test index 11408ac..40c09b9 100644 --- a/tests/entry.test +++ b/tests/entry.test @@ -12,12 +12,12 @@ eval tcltest::configure $argv tcltest::loadTestedCommands # For xscrollcommand -proc scroll args { +proc scroll {args} { global scrollInfo set scrollInfo $args } # For trace variable -proc override args { +proc override {args} { global x set x 12345 } @@ -39,7 +39,6 @@ proc doval3 {W d i P s S v V} { set cy [font metrics {Courier -12} -linespace] - test entry-1.1 {configuration option: "background" for entry} -setup { entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold} pack .e @@ -65,8 +64,8 @@ test entry-1.3 {configuration option: "bd" for entry} -setup { pack .e update } -body { - .e configure -bd 4 - .e cget -bd + .e configure -borderwidth 4 + .e cget -borderwidth } -cleanup { destroy .e } -result {4} @@ -75,7 +74,7 @@ test entry-1.4 {configuration option: "bd" for entry} -setup { pack .e update } -body { - .e configure -bd badValue + .e configure -borderwidth badValue } -cleanup { destroy .e } -returnCodes {error} -result {bad screen distance "badValue"} @@ -85,8 +84,8 @@ test entry-1.5 {configuration option: "bg" for entry} -setup { pack .e update } -body { - .e configure -bg #ff0000 - .e cget -bg + .e configure -background #ff0000 + .e cget -background } -cleanup { destroy .e } -result {#ff0000} @@ -95,7 +94,7 @@ test entry-1.6 {configuration option: "bg" for entry} -setup { pack .e update } -body { - .e configure -bg non-existent + .e configure -background non-existent } -cleanup { destroy .e } -returnCodes {error} -result {unknown color name "non-existent"} @@ -205,8 +204,8 @@ test entry-1.17 {configuration option: "fg" for entry} -setup { pack .e update } -body { - .e configure -fg #110022 - .e cget -fg + .e configure -foreground #110022 + .e cget -foreground } -cleanup { destroy .e } -result {#110022} @@ -215,7 +214,7 @@ test entry-1.18 {configuration option: "fg" for entry} -setup { pack .e update } -body { - .e configure -fg non-existent + .e configure -foreground non-existent } -cleanup { destroy .e } -returnCodes {error} -result {unknown color name "non-existent"} @@ -627,8 +626,6 @@ test entry-1.58 {configuration option: "xscrollcommand" for entry} -setup { destroy .e } -result {Some command} - - test entry-2.1 {Tk_EntryCmd procedure} -body { entry } -returnCodes error -result {wrong # args: should be "entry pathName ?-option value ...?"} @@ -660,7 +657,6 @@ test entry-2.5 {Tk_EntryCmd procedure} -body { destroy .e } -result {.e} - test entry-3.1 {EntryWidgetCmd procedure} -setup { entry .e pack .e @@ -795,8 +791,8 @@ test entry-3.13 {EntryWidgetCmd procedure, "cget" widget command} -setup { test entry-3.14 {EntryWidgetCmd procedure, "cget" widget command} -setup { entry .e } -body { - .e configure -bd 4 - .e cget -bd + .e configure -borderwidth 4 + .e cget -borderwidth } -cleanup { destroy .e } -result {4} @@ -819,9 +815,9 @@ test entry-3.16 {EntryWidgetCmd procedure, "configure" widget command} -setup { test entry-3.17 {EntryWidgetCmd procedure, "configure" widget command} -setup { entry .e } -body { - .e configure -bd 4 - .e configure -bg #ffffff - lindex [.e configure -bd] 4 + .e configure -borderwidth 4 + .e configure -background #ffffff + lindex [.e configure -borderwidth] 4 } -cleanup { destroy .e } -result {4} @@ -1678,7 +1674,6 @@ test entry-5.7 {ConfigureEntry procedure} -setup { destroy .e } -result {0.000000 0.363636} - test entry-5.8 {ConfigureEntry procedure} -constraints { fonts } -setup { @@ -1700,7 +1695,7 @@ test entry-5.9 {ConfigureEntry procedure} -constraints { entry .e -borderwidth 2 -highlightthickness 2 pack .e } -body { - .e configure -font {Courier -12} -bd 2 -relief raised + .e configure -font {Courier -12} -borderwidth 2 -relief raised .e insert end "0123" update list [.e index @10] [.e index @11] [.e index @12] [.e index @13] @@ -1713,7 +1708,7 @@ test entry-5.10 {ConfigureEntry procedure} -constraints { entry .e -borderwidth 2 -highlightthickness 2 pack .e } -body { - .e configure -font {Courier -12} -bd 2 -relief flat + .e configure -font {Courier -12} -borderwidth 2 -relief flat .e insert end "0123" update list [.e index @10] [.e index @11] [.e index @12] [.e index @13] @@ -1740,7 +1735,7 @@ test entry-6.1 {EntryComputeGeometry procedure} -constraints { entry .e pack .e } -body { - .e configure -font {Courier -12} -bd 2 -relief raised -width 20 \ + .e configure -font {Courier -12} -borderwidth 2 -relief raised -width 20 \ -highlightthickness 3 .e insert end 012\t45 update @@ -1754,7 +1749,7 @@ test entry-6.2 {EntryComputeGeometry procedure} -constraints { entry .e pack .e } -body { - .e configure -font {Courier -12} -bd 2 -relief raised -width 20 \ + .e configure -font {Courier -12} -borderwidth 2 -relief raised -width 20 \ -justify center -highlightthickness 3 .e insert end 012\t45 update @@ -1768,7 +1763,7 @@ test entry-6.3 {EntryComputeGeometry procedure} -constraints { entry .e pack .e } -body { - .e configure -font {Courier -12} -bd 2 -relief raised -width 20 \ + .e configure -font {Courier -12} -borderwidth 2 -relief raised -width 20 \ -justify right -highlightthickness 3 .e insert end 012\t45 update @@ -1780,7 +1775,7 @@ test entry-6.4 {EntryComputeGeometry procedure} -setup { entry .e pack .e } -body { - .e configure -font {Courier -12} -bd 2 -relief raised -width 5 + .e configure -font {Courier -12} -borderwidth 2 -relief raised -width 5 .e insert end "01234567890" update .e xview 6 @@ -1792,7 +1787,7 @@ test entry-6.5 {EntryComputeGeometry procedure} -setup { entry .e -highlightthickness 2 pack .e } -body { - .e configure -font {Courier -12} -bd 2 -relief raised -width 5 + .e configure -font {Courier -12} -borderwidth 2 -relief raised -width 5 .e insert end "01234567890" update .e xview 7 @@ -1806,7 +1801,7 @@ test entry-6.6 {EntryComputeGeometry procedure} -constraints { entry .e -highlightthickness 2 pack .e } -body { - .e configure -font {Courier -12} -bd 2 -relief raised -width 10 + .e configure -font {Courier -12} -borderwidth 2 -relief raised -width 10 .e insert end "01234\t67890" update .e xview 3 @@ -1820,7 +1815,7 @@ test entry-6.7 {EntryComputeGeometry procedure} -constraints { entry .e -highlightthickness 2 pack .e } -body { - .e configure -font {Helvetica -24} -bd 3 -relief raised -width 5 + .e configure -font {Helvetica -24} -borderwidth 3 -relief raised -width 5 .e insert end "01234567" update list [winfo reqwidth .e] [winfo reqheight .e] @@ -1833,7 +1828,7 @@ test entry-6.8 {EntryComputeGeometry procedure} -constraints { entry .e -highlightthickness 2 pack .e } -body { - .e configure -font {Helvetica -24} -bd 3 -relief raised -width 0 + .e configure -font {Helvetica -24} -borderwidth 3 -relief raised -width 0 .e insert end "01234567" update list [winfo reqwidth .e] [winfo reqheight .e] @@ -1846,7 +1841,7 @@ test entry-6.9 {EntryComputeGeometry procedure} -constraints { entry .e -highlightthickness 2 pack .e } -body { - .e configure -font {Helvetica -24} -bd 3 -relief raised -width 0 + .e configure -font {Helvetica -24} -borderwidth 3 -relief raised -width 0 update list [winfo reqwidth .e] [winfo reqheight .e] } -cleanup { @@ -1858,7 +1853,7 @@ test entry-6.10 {EntryComputeGeometry procedure} -constraints { entry .e -highlightthickness 2 -font {Helvetica -12} pack .e } -body { - .e configure -bd 1 -relief raised -width 0 -show . + .e configure -borderwidth 1 -relief raised -width 0 -show . .e insert 0 12345 update set x [winfo reqwidth .e] @@ -1875,7 +1870,7 @@ test entry-6.11 {EntryComputeGeometry procedure} -constraints { entry .e -highlightthickness 2 pack .e } -body { - .e configure -bd 1 -relief raised -width 0 -show . -font {helvetica 12} + .e configure -borderwidth 1 -relief raised -width 0 -show . -font {helvetica 12} .e insert 0 12345 update set x1 [winfo reqwidth .e] @@ -1893,10 +1888,9 @@ test entry-6.11 {EntryComputeGeometry procedure} -constraints { destroy .e } -result {1 1 1} - test entry-7.1 {InsertChars procedure} -setup { unset -nocomplain contents - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -1911,7 +1905,7 @@ test entry-7.1 {InsertChars procedure} -setup { test entry-7.2 {InsertChars procedure} -setup { unset -nocomplain contents - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -1924,7 +1918,7 @@ test entry-7.2 {InsertChars procedure} -setup { destroy .e } -result {abcdeXXX abcdeXXX {0.000000 1.000000}} test entry-7.3 {InsertChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e insert 0 0123456789 @@ -1938,7 +1932,7 @@ test entry-7.3 {InsertChars procedure} -setup { destroy .e } -result {5 9 5 8} test entry-7.4 {InsertChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e insert 0 0123456789 @@ -1952,7 +1946,7 @@ test entry-7.4 {InsertChars procedure} -setup { destroy .e } -result {2 9 2 8} test entry-7.5 {InsertChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e insert 0 0123456789 @@ -1966,7 +1960,7 @@ test entry-7.5 {InsertChars procedure} -setup { destroy .e } -result {2 9 2 8} test entry-7.6 {InsertChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e insert 0 0123456789 @@ -1980,7 +1974,7 @@ test entry-7.6 {InsertChars procedure} -setup { destroy .e } -result {2 6 2 5} test entry-7.7 {InsertChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e configure -xscrollcommand scroll @@ -1992,7 +1986,7 @@ test entry-7.7 {InsertChars procedure} -setup { destroy .e } -result {7} test entry-7.8 {InsertChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e insert 0 0123456789 @@ -2003,7 +1997,7 @@ test entry-7.8 {InsertChars procedure} -setup { destroy .e } -result {4} test entry-7.9 {InsertChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e insert 0 "This is a very long string" @@ -2015,7 +2009,7 @@ test entry-7.9 {InsertChars procedure} -setup { destroy .e } -result {7} test entry-7.10 {InsertChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e insert 0 "This is a very long string" @@ -2030,7 +2024,7 @@ test entry-7.10 {InsertChars procedure} -setup { test entry-7.11 {InsertChars procedure} -constraints { fonts } -setup { - entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 0 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e insert 0 "xyzzy" @@ -2043,7 +2037,7 @@ test entry-7.11 {InsertChars procedure} -constraints { test entry-8.1 {DeleteChars procedure} -setup { unset -nocomplain contents - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2057,7 +2051,7 @@ test entry-8.1 {DeleteChars procedure} -setup { } -result {abe abe {0.000000 1.000000}} test entry-8.2 {DeleteChars procedure} -setup { unset -nocomplain contents - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2071,7 +2065,7 @@ test entry-8.2 {DeleteChars procedure} -setup { } -result {cde cde {0.000000 1.000000}} test entry-8.3 {DeleteChars procedure} -setup { unset -nocomplain contents - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2084,7 +2078,7 @@ test entry-8.3 {DeleteChars procedure} -setup { destroy .e } -result {abc abc {0.000000 1.000000}} test entry-8.4 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2100,7 +2094,7 @@ test entry-8.4 {DeleteChars procedure} -setup { destroy .e } -result {1 6 1 5} test entry-8.5 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2116,7 +2110,7 @@ test entry-8.5 {DeleteChars procedure} -setup { destroy .e } -result {1 5 1 4} test entry-8.6 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2132,7 +2126,7 @@ test entry-8.6 {DeleteChars procedure} -setup { destroy .e } -result {1 2 1 5} test entry-8.7 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2146,7 +2140,7 @@ test entry-8.7 {DeleteChars procedure} -setup { destroy .e } -returnCodes error -result {selection isn't in widget .e} test entry-8.8 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2162,7 +2156,7 @@ test entry-8.8 {DeleteChars procedure} -setup { destroy .e } -result {3 4 3 8} test entry-8.9 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e insert 0 0123456789abcde @@ -2175,7 +2169,7 @@ test entry-8.9 {DeleteChars procedure} -setup { destroy .e } -returnCodes error -result {selection isn't in widget .e} test entry-8.10 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2191,7 +2185,7 @@ test entry-8.10 {DeleteChars procedure} -setup { destroy .e } -result {3 5 5 8} test entry-8.11 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2207,7 +2201,7 @@ test entry-8.11 {DeleteChars procedure} -setup { destroy .e } -result {3 8 4 8} test entry-8.12 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2220,7 +2214,7 @@ test entry-8.12 {DeleteChars procedure} -setup { destroy .e } -result {1} test entry-8.13 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2233,7 +2227,7 @@ test entry-8.13 {DeleteChars procedure} -setup { destroy .e } -result {1} test entry-8.14 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2246,7 +2240,7 @@ test entry-8.14 {DeleteChars procedure} -setup { destroy .e } -result {4} test entry-8.15 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2259,7 +2253,7 @@ test entry-8.15 {DeleteChars procedure} -setup { destroy .e } -result {1} test entry-8.16 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2272,7 +2266,7 @@ test entry-8.16 {DeleteChars procedure} -setup { destroy .e } -result {1} test entry-8.17 {DeleteChars procedure} -setup { - entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 10 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2285,7 +2279,7 @@ test entry-8.17 {DeleteChars procedure} -setup { destroy .e } -result {4} test entry-8.18 {DeleteChars procedure} -setup { - entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2 + entry .e -width 0 -font {Courier -12} -highlightthickness 2 -borderwidth 2 pack .e focus .e } -body { @@ -2310,11 +2304,10 @@ test entry-9.1 {EntryValueChanged procedure} -setup { unset x } -result {12345 12345} - test entry-10.1 {EntrySetValue procedure} -constraints fonts -body { set x abcde set y ab - entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2 -width 0 + entry .e -font {Helvetica -12} -highlightthickness 2 -borderwidth 2 -width 0 pack .e .e configure -textvariable x .e configure -textvariable y @@ -2325,7 +2318,7 @@ test entry-10.1 {EntrySetValue procedure} -constraints fonts -body { } -result {ab 24} test entry-10.2 {EntrySetValue procedure, updating selection} -setup { unset -nocomplain x - entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2 + entry .e -font {Helvetica -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e configure -textvariable x @@ -2338,7 +2331,7 @@ test entry-10.2 {EntrySetValue procedure, updating selection} -setup { } -returnCodes error -result {selection isn't in widget .e} test entry-10.3 {EntrySetValue procedure, updating selection} -setup { unset -nocomplain x - entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2 + entry .e -font {Helvetica -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e configure -textvariable x @@ -2351,7 +2344,7 @@ test entry-10.3 {EntrySetValue procedure, updating selection} -setup { } -result {4 7} test entry-10.4 {EntrySetValue procedure, updating selection} -setup { unset -nocomplain x - entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2 + entry .e -font {Helvetica -12} -highlightthickness 2 -borderwidth 2 pack .e } -body { .e configure -textvariable x @@ -2364,7 +2357,7 @@ test entry-10.4 {EntrySetValue procedure, updating selection} -setup { } -result {4 10} test entry-10.5 {EntrySetValue procedure, updating display position} -setup { unset -nocomplain x - entry .e -highlightthickness 2 -bd 2 + entry .e -highlightthickness 2 -borderwidth 2 pack .e } -body { .e configure -width 10 -font {Courier -12} -textvariable x @@ -2379,7 +2372,7 @@ test entry-10.5 {EntrySetValue procedure, updating display position} -setup { } -result {0} test entry-10.6 {EntrySetValue procedure, updating display position} -setup { unset -nocomplain x - entry .e -highlightthickness 2 -bd 2 + entry .e -highlightthickness 2 -borderwidth 2 pack .e } -body { .e configure -width 10 -font {Courier -12} -textvariable x @@ -2395,7 +2388,7 @@ test entry-10.6 {EntrySetValue procedure, updating display position} -setup { } -result {10} test entry-10.7 {EntrySetValue procedure, updating insertion cursor} -setup { unset -nocomplain x - entry .e -highlightthickness 2 -bd 2 + entry .e -highlightthickness 2 -borderwidth 2 pack .e update } -body { @@ -2410,7 +2403,7 @@ test entry-10.7 {EntrySetValue procedure, updating insertion cursor} -setup { } -result {3} test entry-10.8 {EntrySetValue procedure, updating insertion cursor} -setup { unset -nocomplain x - entry .e -highlightthickness 2 -bd 2 + entry .e -highlightthickness 2 -borderwidth 2 pack .e } -body { .e configure -width 10 -font {Courier -12} -textvariable x @@ -2424,7 +2417,7 @@ test entry-10.8 {EntrySetValue procedure, updating insertion cursor} -setup { } -result {5} test entry-11.1 {EntryEventProc procedure} -setup { - entry .e -highlightthickness 2 -bd 2 -font {Helvetica -12} + entry .e -highlightthickness 2 -borderwidth 2 -font {Helvetica -12} pack .e } -body { .e insert 0 abcdefg @@ -2436,10 +2429,10 @@ test entry-11.1 {EntryEventProc procedure} -setup { test entry-11.2 {EntryEventProc procedure} -setup { set x {} } -body { - entry .e1 -fg #112233 + entry .e1 -foreground #112233 rename .e1 .e2 lappend x [winfo children .] - lappend x [.e2 cget -fg] + lappend x [.e2 cget -foreground] destroy .e1 lappend x [info command .e*] [winfo children .] } -cleanup { @@ -2454,9 +2447,8 @@ test entry-12.1 {EntryCmdDeletedProc procedure} -body { destroy .b } -result {{} {}} - test entry-13.1 {GetEntryIndex procedure} -setup { - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e } -body { .e insert 0 012345678901234567890 @@ -2473,7 +2465,7 @@ test entry-13.2 {GetEntryIndex procedure} -body { destroy .e } -returnCodes error -result {bad entry index "abogus"} test entry-13.3 {GetEntryIndex procedure} -setup { - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e } -body { .e insert 0 012345678901234567890 @@ -2486,7 +2478,7 @@ test entry-13.3 {GetEntryIndex procedure} -setup { destroy .e } -result {1} test entry-13.4 {GetEntryIndex procedure} -setup { - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e } -body { .e insert 0 012345678901234567890 @@ -2499,7 +2491,7 @@ test entry-13.4 {GetEntryIndex procedure} -setup { destroy .e } -result {4} test entry-13.5 {GetEntryIndex procedure} -setup { - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e } -body { .e insert 0 012345678901234567890 @@ -2520,7 +2512,7 @@ test entry-13.6 {GetEntryIndex procedure} -setup { destroy .e } -returnCodes error -result {bad entry index "ebogus"} test entry-13.7 {GetEntryIndex procedure} -setup { - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e } -body { .e insert 0 012345678901234567890 @@ -2539,7 +2531,7 @@ test entry-13.8 {GetEntryIndex procedure} -setup { destroy .e } -returnCodes error -result {bad entry index "ibogus"} test entry-13.9 {GetEntryIndex procedure} -setup { - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e } -body { .e insert 0 012345678901234567890 @@ -2552,16 +2544,11 @@ test entry-13.9 {GetEntryIndex procedure} -setup { destroy .e } -result {1 6} - - - - - test entry-13.10 {GetEntryIndex procedure} -constraints unix -body { # On unix, when selection is cleared, entry widget's internal # selection range is reset. # Previous settings: - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e .e insert 0 012345678901234567890 .e xview 4 @@ -2581,7 +2568,7 @@ test entry-13.11 {GetEntryIndex procedure} -constraints win -body { # last selected range. When selection ownership is restored to # entry, the old range will be rehighlighted. # Previous settings: - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e .e insert 0 012345678901234567890 .e xview 4 @@ -2599,7 +2586,7 @@ test entry-13.11 {GetEntryIndex procedure} -constraints win -body { test entry-13.12 {GetEntryIndex procedure} -constraints unix -body { # Previous settings: - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e .e insert 0 012345678901234567890 .e xview 4 @@ -2618,7 +2605,7 @@ test entry-13.12 {GetEntryIndex procedure} -constraints unix -body { # it behaves differently? test entry-13.12.1 {GetEntryIndex procedure} -constraints unix -body { # Previous settings: - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e .e insert 0 012345678901234567890 .e xview 4 @@ -2635,7 +2622,7 @@ test entry-13.12.1 {GetEntryIndex procedure} -constraints unix -body { test entry-13.13 {GetEntryIndex procedure} -constraints win -body { # Previous settings: - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e .e insert 0 012345678901234567890 .e xview 4 @@ -2655,7 +2642,7 @@ test entry-13.14 {GetEntryIndex procedure} -constraints win -body { # last selected range. When selection ownership is restored to # entry, the old range will be rehighlighted. # Previous settings: - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e .e insert 0 012345678901234567890 .e xview 4 @@ -2675,7 +2662,7 @@ test entry-13.14.1 {GetEntryIndex procedure} -constraints win -body { # last selected range. When selection ownership is restored to # entry, the old range will be rehighlighted. # Previous settings: - entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken + entry .e -font {Courier -12} -width 5 -borderwidth 2 -relief sunken pack .e .e insert 0 012345678901234567890 .e xview 4 @@ -2700,7 +2687,7 @@ test entry-13.15 {GetEntryIndex procedure} -body { } -returnCodes error -result {bad entry index "@xyz"} test entry-13.16 {GetEntryIndex procedure} -constraints fonts -body { - entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\ + entry .e -width 5 -relief sunken -highlightthickness 2 -borderwidth 2\ -font {Courier -12} pack .e .e insert 0 012345678901234567890 @@ -2711,7 +2698,7 @@ test entry-13.16 {GetEntryIndex procedure} -constraints fonts -body { destroy .e } -result {4} test entry-13.17 {GetEntryIndex procedure} -constraints fonts -body { - entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\ + entry .e -width 5 -relief sunken -highlightthickness 2 -borderwidth 2\ -font {Courier -12} pack .e .e insert 0 012345678901234567890 @@ -2722,7 +2709,7 @@ test entry-13.17 {GetEntryIndex procedure} -constraints fonts -body { destroy .e } -result {4} test entry-13.18 {GetEntryIndex procedure} -constraints fonts -body { - entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\ + entry .e -width 5 -relief sunken -highlightthickness 2 -borderwidth 2\ -font {Courier -12} pack .e .e insert 0 012345678901234567890 @@ -2733,7 +2720,7 @@ test entry-13.18 {GetEntryIndex procedure} -constraints fonts -body { destroy .e } -result {5} test entry-13.19 {GetEntryIndex procedure} -constraints fonts -body { - entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\ + entry .e -width 5 -relief sunken -highlightthickness 2 -borderwidth 2\ -font {Courier -12} pack .e .e insert 0 012345678901234567890 @@ -2744,7 +2731,7 @@ test entry-13.19 {GetEntryIndex procedure} -constraints fonts -body { destroy .e } -result {8} test entry-13.20 {GetEntryIndex procedure} -constraints fonts -body { - entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\ + entry .e -width 5 -relief sunken -highlightthickness 2 -borderwidth 2\ -font {Courier -12} pack .e .e insert 0 012345678901234567890 @@ -2755,7 +2742,7 @@ test entry-13.20 {GetEntryIndex procedure} -constraints fonts -body { destroy .e } -result {9} test entry-13.21 {GetEntryIndex procedure} -body { - entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\ + entry .e -width 5 -relief sunken -highlightthickness 2 -borderwidth 2\ -font {Courier -12} pack .e .e insert 0 012345678901234567890 @@ -2775,7 +2762,7 @@ test entry-13.22 {GetEntryIndex procedure} -setup { destroy .e } -returnCodes error -result {bad entry index "1xyz"} test entry-13.23 {GetEntryIndex procedure} -body { - entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\ + entry .e -width 5 -relief sunken -highlightthickness 2 -borderwidth 2\ -font {Courier -12} pack .e .e insert 0 012345678901234567890 @@ -2786,7 +2773,7 @@ test entry-13.23 {GetEntryIndex procedure} -body { destroy .e } -result {0} test entry-13.24 {GetEntryIndex procedure} -body { - entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\ + entry .e -width 5 -relief sunken -highlightthickness 2 -borderwidth 2\ -font {Courier -12} pack .e .e insert 0 012345678901234567890 @@ -2797,7 +2784,7 @@ test entry-13.24 {GetEntryIndex procedure} -body { destroy .e } -result {12} test entry-13.25 {GetEntryIndex procedure} -body { - entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\ + entry .e -width 5 -relief sunken -highlightthickness 2 -borderwidth 2\ -font {Courier -12} pack .e .e insert 0 012345678901234567890 @@ -2808,7 +2795,7 @@ test entry-13.25 {GetEntryIndex procedure} -body { destroy .e } -result {21} test entry-13.26 {GetEntryIndex procedure} -constraints fonts -body { - entry .e -highlightthickness 2 -bd 2 -font {Helvetica -12} + entry .e -highlightthickness 2 -borderwidth 2 -font {Helvetica -12} selection clear .e .e configure -show . .e insert 0 XXXYZZY @@ -2908,7 +2895,6 @@ test entry-16.4 {EntryVisibleRange procedure} -body { destroy .e } -result {0.000000 1.000000} - test entry-17.1 {EntryUpdateScrollbar procedure} -body { entry .e -width 10 -xscrollcommand scroll -font {Courier -12} pack .e @@ -2957,7 +2943,6 @@ test entry-17.4 {EntryUpdateScrollbar procedure} -setup { "thisisnotacommand 0.0 1.0" (horizontal scrolling command executed by .e)}} - test entry-18.1 {Entry widget vs hiding} -setup { entry .e } -body { @@ -3272,7 +3257,6 @@ test entry-19.16 {entry widget validation} -setup { destroy .e } -result {1 {.e -1 -1 abcd abcd {} all forced}} - test entry-19.17 {entry widget validation} -setup { unset -nocomplain ::e ::vVals } -body { @@ -3289,7 +3273,6 @@ test entry-19.17 {entry widget validation} -setup { destroy .e } -result {focusout {.e -1 -1 newdata abcd {} focusout forced}} - # proc doval changed - returns 0 test entry-19.18 {entry widget validation} -setup { unset -nocomplain ::e ::vVals @@ -3419,7 +3402,7 @@ test entry-20.7 {widget deletion with textvariable active} -body { # SF bugs 607390 and 617446 set FOO init entry .e -textvariable FOO -validate all \ - -vcmd {%W configure -bg white; format 1} + -vcmd {%W configure -background white; format 1} bind .e <Destroy> { set FOO hello } destroy .e winfo exists .e @@ -3427,7 +3410,6 @@ test entry-20.7 {widget deletion with textvariable active} -body { destroy .e } -result {0} - test entry-21.1 {selection present while disabled, bug 637828} -body { entry .e .e insert end 0123456789 |