Import Tk 8.6.10

tests/unixButton.test

@@ -35,7 +35,15 @@ proc bogusTrace args {
     error "trace aborted"
 }
 
-
+if {[tk windowingsystem] eq "aqua"} {
+    set smallIndicator 20
+    set bigIndicator 20
+    set defaultBorder 10
+} else {
+    set smallIndicator 27
+    set bigIndicator 40
+    set defaultBorder 20
+}
 test unixbutton-1.1 {TkpComputeButtonGeometry procedure} -constraints {
     unix testImageType
 } -setup {
@@ -57,7 +65,10 @@ test unixbutton-1.1 {TkpComputeButtonGeometry procedure} -constraints {
 } -cleanup {
     deleteWindows
     image delete image1
-} -result {68 48 74 54 112 52 112 52}
+} -result [list 68 48 \
+                74 54 \
+	        [expr {72 + $bigIndicator}] 52 \
+	        [expr {72 + $bigIndicator}] 52]
 test unixbutton-1.2 {TkpComputeButtonGeometry procedure} -constraints {
     unix 
 } -setup {
@@ -75,7 +86,10 @@ test unixbutton-1.2 {TkpComputeButtonGeometry procedure} -constraints {
         [winfo reqwidth .b4] [winfo reqheight .b4]
 } -cleanup {
     deleteWindows
-} -result {23 33 29 39 54 37 54 37}
+} -result [list 23 33 \
+	        29 39 \
+	        [expr {27 + $smallIndicator}] 37 \
+	        [expr {27 + $smallIndicator}] 37]
 test unixbutton-1.3 {TkpComputeButtonGeometry procedure} -constraints {
     unix 
 } -setup {
@@ -186,7 +200,7 @@ test unixbutton-1.9 {TkpComputeButtonGeometry procedure} -constraints {
     list [winfo reqwidth .b2] [winfo reqheight .b2]
 } -cleanup {
     deleteWindows
-} -result {37 47}
+} -result [list [expr {17 + $defaultBorder}] [expr {27 + $defaultBorder}]] 
 test unixbutton-1.10 {TkpComputeButtonGeometry procedure} -constraints {
     unix 
 } -setup {
@@ -196,7 +210,7 @@ test unixbutton-1.10 {TkpComputeButtonGeometry procedure} -constraints {
     list [winfo reqwidth .b2] [winfo reqheight .b2]
 } -cleanup {
     deleteWindows
-} -result {37 47}
+} -result [list [expr {17 + $defaultBorder}] [expr {27 + $defaultBorder}]]
 test unixbutton-1.11 {TkpComputeButtonGeometry procedure} -constraints {
     unix 
 } -setup {