* tests/listbox.test, tests/panedwindow.test, tests/scrollbar.test:

	* library/bgerror.tcl, library/dialog.tcl, library/listbox.tcl:
	* library/msgbox.tcl, library/optMenu.tcl, library/tclIndex:
	* library/tkfbox.tcl, library/demos/floor.tcl, library/demos/rmt:
	* library/demos/tcolor, library/demos/text.tcl:
	* library/demos/twind.tcl, library/demos/widget: Buh-bye Motif look
	* library/ttk/fonts.tcl:    Update of Tk default look in 8.5
	* macosx/tkMacOSXDefault.h: Trims border sizes, cleaner X11 look
	* unix/tkUnixDefault.h:     with minor modifications for Win32/Aqua.
	* win/tkWinDefault.h:       Uses Tk*Font definitions throughout for
	* win/tkWinFont.c:          classic widgets. [Bug #1820344]
	* library/obsolete.tcl (::tk::classic::restore): This restores
	changes made to defaults in 8.5 using the 'option' command,
	segmented into logical groups.

3 files changed, 18 insertions, 18 deletions

diff --git a/tests/listbox.test b/tests/listbox.test
index a3d43ea..eae761b 100644
--- a/tests/listbox.test
+++ b/tests/listbox.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: listbox.test,v 1.26 2006/05/29 21:53:16 hobbs Exp $
+# RCS: @(#) $Id: listbox.test,v 1.27 2007/10/30 01:57:55 hobbs Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -2127,20 +2127,20 @@ test listbox-27.1 {widget deletion while active} {
 } 0
 
 test listbox-28.1 {listbox -activestyle} {
-    catch {destroy .l}
+    destroy .l
     listbox .l -activ non
     .l cget -activestyle
 } none
 test listbox-28.2 {listbox -activestyle} {
-    catch {destroy .l}
+    destroy .l
     listbox .l
     .l cget -activestyle
-} underline
+} dotbox
 test listbox-28.3 {listbox -activestyle} {
-    catch {destroy .l}
-    listbox .l -activestyle dot
+    destroy .l
+    listbox .l -activestyle und
     .l cget -activestyle
-} dotbox
+} underline
 
 test listbox-29.1 {listbox selection behavior, -state disabled} {
     destroy .l
diff --git a/tests/panedwindow.test b/tests/panedwindow.test
index fc278c7..8fb581b 100644
--- a/tests/panedwindow.test
+++ b/tests/panedwindow.test
@@ -6,7 +6,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: panedwindow.test,v 1.20 2005/05/31 05:23:44 hobbs Exp $
+# RCS: @(#) $Id: panedwindow.test,v 1.21 2007/10/30 01:57:55 hobbs Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -1949,7 +1949,7 @@ test panedwindow-22.16 {ArrangePanes, last pane grows} {
 		[winfo width .f4] [winfo width .p]
     }
     -cleanup {destroy .p .f1 .f2 .f3 .f4}
-    -result {50 150 1 1 222 50 150 1 78 300}
+    -result {50 150 1 1 211 50 150 1 89 300}
 }
 
 
@@ -2282,7 +2282,7 @@ test panedwindow-24.29.1 {ConfigurePanes, -hide works} {
 		[winfo width .f4] [winfo width .p]
     }
     -cleanup {destroy .p .f1 .f2 .f3 .f4}
-    -result {1 1 1 1 40 40 40 40 182 1 0 1 1 40 40 40 40 136}
+    -result {1 1 1 1 40 40 40 40 171 1 0 1 1 40 40 40 40 128}
 }
 test panedwindow-24.29.2 {ConfigurePanes, -hide works} {
     -body {
@@ -2307,7 +2307,7 @@ test panedwindow-24.29.2 {ConfigurePanes, -hide works} {
 		[winfo width .f4] [winfo width .p]
     }
     -cleanup {destroy .p .f1 .f2 .f3 .f4}
-    -result {1 1 1 0 28 40 40 1 130 1 0 1 1 40 40 40 34 130}
+    -result {1 1 1 0 39 40 40 1 130 1 0 1 1 40 40 40 42 130}
 }
 test panedwindow-24.29.3 {ConfigurePanes, -hide works, last pane stretches} {
     -body {
@@ -2325,7 +2325,7 @@ test panedwindow-24.29.3 {ConfigurePanes, -hide works, last pane stretches} {
 	lappend result [winfo width .f1] [winfo width .f2] [winfo width .f3]
     }
     -cleanup {destroy .p .f1 .f2 .f3}
-    -result {50 50 88 50 50 144}
+    -result {50 50 94 50 50 147}
 }
 test panedwindow-24.29.4 {ConfigurePanes, -hide works, last pane stretches} {
     -body {
@@ -2344,7 +2344,7 @@ test panedwindow-24.29.4 {ConfigurePanes, -hide works, last pane stretches} {
 	lappend result [winfo height .f1] [winfo height .f2] [winfo height .f3]
     }
     -cleanup {destroy .p .f1 .f2 .f3}
-    -result {50 50 88 50 50 144}
+    -result {50 50 94 50 50 147}
 }
 
 test panedwindow-24.30 {ConfigurePanes, -stretch first} {
@@ -2366,7 +2366,7 @@ test panedwindow-24.30 {ConfigurePanes, -stretch first} {
 		[winfo width .f4]
     }
     -cleanup {destroy .p .f1 .f2 .f3 .f4}
-    -result {40 40 40 40 86 40 40 40}
+    -result {51 40 40 40 94 40 40 40}
 }
 test panedwindow-24.31 {ConfigurePanes, -stretch middle} {
     -body {
@@ -2387,7 +2387,7 @@ test panedwindow-24.31 {ConfigurePanes, -stretch middle} {
 		[winfo width .f4]
     }
     -cleanup {destroy .p .f1 .f2 .f3 .f4}
-    -result {40 40 40 40 40 40 86 40}
+    -result {40 45 46 40 40 45 94 40}
 }
 test panedwindow-24.32 {ConfigurePanes, -stretch always} {
     -body {
@@ -2408,7 +2408,7 @@ test panedwindow-24.32 {ConfigurePanes, -stretch always} {
 		[winfo width .f4]
     }
     -cleanup {destroy .p .f1 .f2 .f3 .f4}
-    -result {40 40 40 40 55 40 55 56}
+    -result {42 43 43 43 58 43 58 58}
 }
 test panedwindow-24.33 {ConfigurePanes, -stretch never} {
     -body {
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index c88d15c..7e26a4a 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -7,7 +7,7 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: scrollbar.test,v 1.18 2006/04/23 21:51:38 vincentdarley Exp $
+# RCS: @(#) $Id: scrollbar.test,v 1.19 2007/10/30 01:57:57 hobbs Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -177,7 +177,7 @@ test scrollbar-3.13 {ScrollbarWidgetCmd procedure, "cget" option} win {
 } {0 0}
 test scrollbar-3.14 {ScrollbarWidgetCmd procedure, "cget" option} {unix notAqua} {
     list [catch {.s2 cget -highlightthickness} msg] $msg
-} {0 1}
+} {0 0}
 test scrollbar-3.14.1 {ScrollbarWidgetCmd procedure, "cget" option} aqua {
     list [catch {.s2 cget -highlightthickness} msg] $msg
 } {0 0}