scrollbar.test fixes for TkAqua

2 files changed, 15 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index ef301e0..18e8c4d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-23  Vince Darley <vincentdarley@users.sourceforge.net>
+
+	* tests/scrollbar.test: fix to tkAqua test failures
+
 2006-04-18  Vince Darley <vincentdarley@users.sourceforge.net>
 
 	* macosx/tkMacOSXEmbed.c: fix to [Bug 1088814] test failures in
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 84a5bf7..c88d15c 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.17 2006/03/14 06:04:46 dgp Exp $
+# RCS: @(#) $Id: scrollbar.test,v 1.18 2006/04/23 21:51:38 vincentdarley Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
@@ -166,15 +166,21 @@ scrollbar .s2
 test scrollbar-3.11 {ScrollbarWidgetCmd procedure, "cget" option} win {
     list [catch {.s2 cget -bd} msg] $msg
 } {0 0}
-test scrollbar-3.12 {ScrollbarWidgetCmd procedure, "cget" option} unix {
+test scrollbar-3.12 {ScrollbarWidgetCmd procedure, "cget" option} {unix notAqua} {
     list [catch {.s2 cget -bd} msg] $msg
 } {0 2}
+test scrollbar-3.12.1 {ScrollbarWidgetCmd procedure, "cget" option} aqua {
+    list [catch {.s2 cget -bd} msg] $msg
+} {0 0}
 test scrollbar-3.13 {ScrollbarWidgetCmd procedure, "cget" option} win {
     list [catch {.s2 cget -highlightthickness} msg] $msg
 } {0 0}
-test scrollbar-3.14 {ScrollbarWidgetCmd procedure, "cget" option} unix {
+test scrollbar-3.14 {ScrollbarWidgetCmd procedure, "cget" option} {unix notAqua} {
     list [catch {.s2 cget -highlightthickness} msg] $msg
 } {0 1}
+test scrollbar-3.14.1 {ScrollbarWidgetCmd procedure, "cget" option} aqua {
+    list [catch {.s2 cget -highlightthickness} msg] $msg
+} {0 0}
 destroy .s2
 test scrollbar-3.15 {ScrollbarWidgetCmd procedure, "configure" option} {
     llength [.s configure]
@@ -580,6 +586,7 @@ wm geometry .t +0+0
 test scrollbar-8.1 {TkScrollbarEventProc: recursive deletion} {
     proc doit {args} { destroy .t.f }
     proc bgerror {args} {}
+    destroy .t.f
     frame .t.f
     scrollbar .t.f.s -command doit
     pack .t.f -fill both -expand 1
@@ -598,6 +605,7 @@ test scrollbar-8.1 {TkScrollbarEventProc: recursive deletion} {
 test scrollbar-8.2 {TkScrollbarEventProc: recursive deletion} {
     proc doit {args} { destroy .t.f.s }
     proc bgerror {args} {}
+    destroy .t.f
     frame .t.f
     scrollbar .t.f.s -command doit
     pack .t.f -fill both -expand 1