More complete purge of things only present for supporting long-dead Mac 9 systems.

8 files changed, 5 insertions, 1658 deletions

diff --git a/tests/clrpick.test b/tests/clrpick.test
index cd4907a..ec570d2 100644
--- a/tests/clrpick.test
+++ b/tests/clrpick.test
@@ -172,11 +172,7 @@ test clrpick-2.1 {tk_chooseColor command} \
 set color #808040
 test clrpick-2.2 {tk_chooseColor command} \
 	{nonUnixUserInteraction colorsLeftover} {
-    if {$tcl_platform(platform) == "macintosh"} {
-	set colors "32768 32768 16384"
-    } else {
-	set colors "128 128 64"
-    }
+    set colors "128 128 64"
     ToChooseColorByKey $parent 128 128 64
     tk_chooseColor -parent $parent -title "choose $colors"
 } "$color"
diff --git a/tests/font.test b/tests/font.test
index 6abc939..94953b1 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -52,7 +52,6 @@ setup
 case $tcl_platform(platform) {
     unix	{set fixed "fixed"}
     windows	{set fixed "courier 12"}
-    macintosh	{set fixed "monaco 9"}
 }
 set times [font actual {times 0} -family]
 
diff --git a/tests/macMenu.test b/tests/macMenu.test
deleted file mode 100644
index 0de0f51..0000000
--- a/tests/macMenu.test
+++ /dev/null
@@ -1,1547 +0,0 @@
-# This file is a Tcl script to test menus in Tk.  It is
-# organized in the standard fashion for Tcl tests. This
-# file tests the Macintosh-specific features of the menu
-# system.
-#
-# Copyright (c) 1995-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# All rights reserved.
-
-package require tcltest 2.1
-namespace import -force tcltest::configure
-namespace import -force tcltest::testsDirectory
-configure -testdir [file join [pwd] [file dirname [info script]]]
-configure -loadfile [file join [testsDirectory] constraints.tcl]
-tcltest::loadTestedCommands
-
-test macMenu-1.0 {TkMacUseMenuID} {macOnly} {
-    # Can't really test TkMacUseMenuID; it's only called on startup.
-} {}
-
-test macMenu-2.1 {GetNewID} {macOnly} {
-    catch {destroy .m1}
-    list [catch {menu .m1} msg] $msg [destroy .m1]
-} {0 .m1 {}}
-test macMenu-2.2 {GetNewID - cascade menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m2
-    list [catch {menu .m2} msg] $msg [destroy .m1] [destroy .m2]
-} {0 .m2 {} {}}
-test macMenu-2.3 {GetNewID - running out of ids} {macOnly} {
-    deleteWindows
-    menu .menu
-    for {set i 0} {$i < 230} {incr i} {
-    	menu .m$i
-    	.menu add cascade -label ".m$i" -menu .m$i
-    }
-    menu .breaker
-    list [catch {.menu add cascade -menu .breaker} msg] $msg [deleteWindows]
-} {1 {No more menus can be allocated.} {}}
-
-test macMenu-3.1 {FreeID} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {destroy .m1} msg] $msg
-} {0 {}}
-
-# No way to test running out of ids in TkpNewPlatformMenu
-test macMenu-4.1 {TkpNewMenu} {macOnly} {
-    catch {destroy .m1}
-    list [catch {menu .m1} msg] $msg [catch {destroy .m1} msg2] $msg2
-} {0 .m1 0 {}}
-test macMenu-4.2 {TkpNewMenu - checking for help menu when one is there} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .m2}
-    menu .m1
-    menu .m1.help -tearoff 0
-    .m1.help add command -label Test
-    . configure -menu .m1
-    raise .
-    update
-    list [catch {menu .m2} msg] $msg [destroy .m1] [destroy .m2] [. configure -menu ""]
-} {0 .m2 {} {} {}}
-test macMenu-4.3 {TkpNewMenu - menubar set but different interp} {macOnly} {
-    catch {interp delete testinterp}
-    catch {destroy .m1}
-    interp create testinterp
-    load {} Tk testinterp
-    interp eval testinterp {raise .}
-    interp eval testinterp {menu .m1}
-    interp eval testinterp {. configure -menu .m1}
-    interp eval testinterp {update}
-    list [catch {menu .m1} msg] $msg [destroy .m1] [interp delete testinterp]
-} {0 .m1 {} {}}
-test macMenu-4.4 {TkpNewMenu - menubar set but new menu has different parent} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .m2}
-    menu .m1 -tearoff 0
-    .m1 add cascade -menu .m1.help
-    menu .m2
-    .m2 add cascade -menu .m2.help
-    . configure -menu .m1
-    raise .
-    update
-    list [catch {menu .m2.help} msg] $msg [. configure -menu ""] [destroy .m1] [destroy .m2]
-} {0 .m2.help {} {} {}}
-test macMenu-4.5 {TkpNewMenu - menubar set, same parent, not .help} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add cascade -menu .m1.help
-    . configure -menu .m1
-    raise .
-    update
-    list [catch {menu .m1.foo} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 .m1.foo {} {}}
-test macMenu-4.6 {TkpNewMenu - creating the help menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add cascade -menu .m1.help
-    . configure -menu .m1
-    raise .
-    update
-    list [catch {menu .m1.help} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 .m1.help {} {}}
-
-test macMenu-5.1 {TkpDestroyMenu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {destroy .m1} msg] $msg
-} {0 {}}
-test macMenu-5.2 {TkpDestroyMenu - help menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add cascade -menu .m1.help
-    . configure -menu .m1
-    menu .m1.help
-    raise .
-    update
-    list [catch {destroy .m1.help} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-5.3 {TkpDestroyMenu - idle handler pending} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label test
-    list [catch {destroy .m1} msg] $msg
-} {0 {}}
-test macMenu-5.4 {TkpDestroyMenu - idle handler not pending} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label test
-    update idletasks
-    list [catch {destroy .m1} msg] $msg
-} {0 {}}
-
-test macMenu-6.1 {SetMenuCascade} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .m2}
-    menu .m1
-    menu .m2
-    list [catch {.m2 add cascade -menu .m1} msg] $msg [destroy .m1 .m2]
-} {0 {} {}}
-test macMenu-6.2 {SetMenuCascade - running out of ids} {macOnly} {
-    deleteWindows
-    menu .menu
-    for {set i 0} {$i < 230} {incr i} {
-    	menu .m$i
-    	.menu add cascade -label ".m$i" -menu .m$i
-    }
-    menu .breaker
-    list [catch {.menu add cascade -menu .breaker} msg] $msg [deleteWindows]
-} {1 {No more menus can be allocated.} {}}
-
-test macMenu-7.1 {TkpDestroyMenuEntry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "test"
-    list [catch {.m1 delete 1} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-7.2 {TkpDestroyMenuEntry - help menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.help
-    menu .m1.help -tearoff 0
-    .m1.help add command -label "test"
-    . configure -menu .m1
-    raise .
-    update
-    list [catch {.m1.help delete test} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-
-test macMenu-8.1 {GetEntryText} {macOnly} {
-    catch {destroy .m1}
-    list [catch {menu .m1} msg] $msg [destroy .m1]
-} {0 .m1 {}}
-test macMenu-8.2 {GetEntryText} {macOnly testImageType} {
-    catch {destroy .m1}
-    catch {image delete image1}
-    menu .m1
-    image create test image1
-    list [catch {.m1 add command -image image1} msg] $msg [destroy .m1] [image delete image1]
-} {0 {} {} {}}
-test macMenu-8.3 {GetEntryText} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -bitmap questhead} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-8.4 {GetEntryText} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-8.5 {GetEntryText} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "foo"
-    list [catch {.m1 add command -label "foo"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-8.6 {GetEntryText} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -label "This is a very long string. 9012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890012345678900123456789001234567890"} \
-    	    msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-8.7 {GetEntryText - elipses character} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -label "foo..."} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-8.8 {GetEntryText - false elipses character} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -label "foo."} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-8.9 {GetEntryText - false elipses character} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -label "foo.."} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-8.10 {GetEntryText - false elipses character} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -label "foo.b"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-8.11 {GetEntryText - false elipses character} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -label "foo..b"} msg] $msg [destroy .m1]
-} {0 {} {}}
-
-
-# test macMenu-9.1 - assumes some fonts
-test macMenu-9.1 {FindMarkCharacter} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -font "Helvetica 12" -tearoff 0
-    .m1 add checkbutton -label test
-    .m1 invoke test
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-# All standard fonts have "¥" defined. We can't test further.
-
-test macMenu-10.1 {SetMenuIndicator - cascade entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add cascade -label foo} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-10.2 {SetMenuIndicator - not radio or checkbutton} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -label foo} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-10.3 {SetMenuIndicator - indiatorOn false} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add checkbutton -label foo -indicatoron 0} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-10.4 {SetMenuIndicator - entry not selected} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add checkbutton -label foo} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-10.5 {SetMenuIndicator - checkbutton} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label foo
-    list [catch {.m1 invoke foo} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-10.6 {SetMenuIndicator - radio button} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add radiobutton -label foo
-    list [catch {.m1 invoke foo} msg] $msg [destroy .m1]
-} {0 {} {}}
-
-test macMenu-11.1 {SetMenuTitle} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .container}
-    menu .container
-    menu .m1
-#previous title is .m1
-    .container add cascade -label "File" -menu .m1
-    list [catch {. configure -menu .container} msg] $msg [. configure -menu ""] [destroy .container .m1]
-} {0 {} {} {}}
-test macMenu-11.2 {SetMenuTitle} {macOnly} {
-    menu .container
-    menu .m1
-    . configure -menu ""
-#previous title is .m1
-    .container add cascade -label "F" -menu .m1
-    list [catch {. configure -menu .container} msg] $msg [. configure -menu ""] [destroy .container .m1]
-} {0 {} {} {}}
-
-test macMenu-12.1 {TkpConfigureMenuEntry} {macOnly} {
-    catch {destroy .m1}
-    . configure -menu ""
-    menu .m1
-    .m1 add cascade -menu .m3
-    list [catch {.m1 entryconfigure 1 -menu .m2} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.2 {TkpConfigureMenuEntry} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .m2}
-    . configure -menu ""
-    menu .m1
-    .m1 add cascade -menu .m3
-    menu .m2
-    list [catch {.m1 entryconfigure 1 -menu .m2} msg] $msg [destroy .m1 .m2]
-} {0 {} {}}
-test macMenu-12.3 {TkpConfigureMenuEntry - running out of ids} {macOnly} {
-    deleteWindows
-    menu .menu
-    for {set i 0} {$i < 230} {incr i} {
-    	menu .m$i
-    	.menu add cascade -label ".m$i" -menu .m$i
-    }
-    menu .breaker
-    list [catch {.menu add cascade -menu .breaker} msg] $msg [deleteWindows]
-} {1 {No more menus can be allocated.} {}}
-test macMenu-12.4 {TkpConfigureMenuEntry - Control} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -accel "Control+S"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.5 {TkpConfigureMenuEntry - Ctrl} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -accel "Ctrl+S"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.6 {TkpConfigureMenuEntry - Shift} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -accel "Shift+S"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.7 {TkpConfigureMenuEntry - Option} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -accel "Opt+S"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.8 {TkpConfigureMenuEntry - Command} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -accel "Command+S"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.9 {TkpConfigureMenuEntry - Cmd} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -accel "Cmd+S"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.10 {TkpConfigureMenuEntry - Alt} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -accel "Alt+S"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.11 {TkpConfigureMenuEntry - Meta} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -accel "Meta+S"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.12 {TkpConfigureMenuEntry - Two modifiers} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -accel "Cmd+Shift+S"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.13 {TkpConfigureMenuEntry - dash instead of plus} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -accel "Command-S"} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.14 {TkpConfigureMenuEntry - idler pending} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add command -label test
-    list [catch {.m1 entryconfigure test -label test2} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-12.15 {TkpConfigureMenuEntry - idler not pending} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add command -label test
-    update idletasks
-    list [catch {.m1 entryconfigure test -label test2} msg] $msg [destroy .m1]
-} {0 {} {}}
-
-test macMenu-13.1 {ReconfigureIndividualMenu - getting rid of zero items} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add command -label test
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.2 {ReconfigureIndividualMenu - getting rid of one item} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add command -label test
-    update idletasks
-    .m1 delete test
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.3 {ReconfigureIndividualMenu - getting rid of more than one} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add command -label test
-    .m1 add command -label test2
-    update idletasks
-    .m1 entryconfigure test2 -label "test two"
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.4 {ReconfigureIndividualMenu - separator} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add separator
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.5 {ReconfigureIndividualMenu - disabled} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command
-    .m1 entryconfigure 1 -state disabled
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.6 {ReconfigureIndividualMenu - active} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command
-    .m1 entryconfigure 1 -state active
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.7 {ReconfigureIndividualMenu - checkbutton not checked} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label test
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.8 {ReconfigureIndividualMenu - checkbutton - indicator off} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label test -indicatoron 0
-    .m1 invoke test
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.9 {ReconfigureIndividualMenu - checkbutton on} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label test
-    .m1 invoke test
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.10 {ReconfigureIndividualMenu - radiobutton not checked} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add radiobutton -label test
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.11 {ReconfigureIndividualMenu - radiobutton - indicator off} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add radiobutton -label test -indicatoron 0
-    .m1 invoke test
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.12 {ReconfigureIndividualMenu - radiobutton on} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add radiobutton -label test
-    .m1 invoke test
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.13 {ReconfigureIndividualMenu} {macOnly} {
-    catch {destroy .m1}
-    . configure -menu ""
-    menu .m1
-    .m1 add cascade -menu .m3
-    .m1 entryconfigure 1 -menu .m2
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.14 {ReconfigureIndividualMenu} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .m2}
-    . configure -menu ""
-    menu .m1
-    .m1 add cascade -menu .m3
-    menu .m2
-    .m1 entryconfigure 1 -menu .m2
-    list [catch {update idletasks} msg] $msg [destroy .m1 .m2]
-} {0 {} {}}
-test macMenu-13.15 {ReconfigureIndividualMenu - accelerator} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -accel "Command-S"
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.16 {ReconfigureIndividualMenu - parent is disabled} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -label .m1.edit -label "Edit" -state disabled
-    menu .m1.edit
-    .m1.edit add command -label foo
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-13.17 {ReconfigureIndividualMenu - disabling parent} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -label .m1.edit -label Edit
-    menu .m1.edit
-    .m1.edit add command -label foo
-    .m1 entryconfigure Edit -state disabled
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-
-test macMenu-14.1 {ReconfigureMacintoshMenu - normal menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add command -label test
-    list [catch {update idletasks} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-14.2 {ReconfigureMacintoshMenu - apple menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.apple
-    menu .m1.apple -tearoff 0
-    .m1.apple add command -label test
-    . configure -menu .m1
-    raise .
-    list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-14.3 {ReconfigureMacintoshMenu - help menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.help
-    menu .m1.help -tearoff 0
-    .m1.help add command -label test
-    . configure -menu .m1
-    raise .
-    list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-14.4 {ReconfigureMacintoshMenu - menubar} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.file -label "foo"
-    menu .m1.file
-    . configure -menu .m1
-    raise .
-    .m1 entryconfigure foo -label "File"
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-
-test macMenu-15.1 {CompleteIdlers - no idle pending} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label test
-    update idletasks
-    list [catch {.m1 post 40 40} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-15.2 {CompleteIdlers - idle pending} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label test
-    list [catch {.m1 post 40 40} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-15.3 {CompleteIdlers - recursive} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.m2 -label test
-    menu .m1.m2
-    .m1.m2 add command -label test
-    list [catch {.m1 post 40 40} msg] $msg [destroy .m1]
-} {0 {} {}}
-
-#Don't know how to generate nested post menus
-test macMenu-16.1 {TkpPostMenu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -postcommand "destroy .m1"
-    list [catch {.m1 post 40 40} msg] $msg
-} {0 {}}
-test macMenu-16.2 {TkpPostMenu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -postcommand "blork"
-    list [catch {.m1 post 40 40} msg] $msg [destroy .m1]
-} {1 {invalid command name "blork"} {}}
-# We need to write the interactive test for menu posting.
-
-test macMenu-17.1 {TkpMenuNewEntry - no idle pending} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [catch {.m1 add command -label test} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-17.2 {TkpMenuNewEntry - idle pending} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label test
-    list [catch {.m1 add command -label test2} msg] $msg [destroy .m1]
-} {0 {} {}}
-
-test macMenu-18.1 {DrawMenuBarWhenIdle} {macOnly} {
-    catch {destroy .m1}
-    . configure -menu ""
-    menu .m1
-    . configure -menu .m1
-    list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.2 {DrawMenuBarWhenIdle - clearing old apple menu out} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.apple
-    menu .m1.apple
-    .m1.apple add command -label test
-    . configure -menu .m1
-    raise .
-    update
-    . configure -menu ""
-    raise .
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-18.3 {DrawMenuBarWhenIdle - clearing out old help menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.help
-    menu .m1.help
-    .m1.help add command -label test
-    . configure -menu .m1
-    raise .
-    update
-    . configure -menu ""
-    raise .
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-18.4 {DrawMenuBarWhenIdle - menu not there} {macOnly} {
-    catch {destroy .m1}
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""]
-} {0 {} {}}
-test macMenu-18.5 {DrawMenuBarWhenIdle - menu there} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.6 {DrawMenuBarWhenIdle - no apple menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.7 {DrawMenuBarWhenIdle - apple menu references but not there} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.apple
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.8 {DrawMenuBarWhenIdle - apple menu there} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.apple
-    menu .m1.apple
-    .m1.apple add command -label test
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.9 {DrawMenuBarWhenIdle - apple menu there; no idle handler} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.apple
-    menu .m1.apple
-    .m1.apple add command -label test
-    . configure -menu .m1
-    raise .
-    update idletasks
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.10 {DrawMenuBarWhenIdle - no help menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.11 {DrawMenuBarWhenIdle - help menu referenced but not there} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.help
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.12 {DrawMenuBarWhenIdle - help menu there} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.help
-    menu .m1.help
-    .m1.help add command -label test
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.13 {DrawMenuBarWhenIdle - help menu there - no idlers} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.help
-    menu .m1.help
-    .m1.help add command -label test
-    . configure -menu .m1
-    raise .
-    update idletasks
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-# Can't generate no menubar clone
-test macMenu-18.14 {DrawMenuBarWhenIdle - apple and help menus in tearoff menubar} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -menu .m1.apple
-    .m1 add cascade -menu .m1.help
-    menu .m1.apple
-    menu .m1.help
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.15 {DrawMenuBarWhenIdle - apple and help menus in non-tearoff menubar} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add cascade -menu .m1.apple
-    .m1 add cascade -menu .m1.help
-    menu .m1.apple
-    menu .m1.help
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.16 {DrawMenuBarWhenIdle - no apple menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.17 {DrawMenuBarWhenIdle - apple menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    . configure -menu .m1
-    .m1 add cascade -menu .m1.apple
-    menu .m1.apple
-    .m1.apple add cascade -label test -menu .m1.apple.test
-    menu .m1.apple.test
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.18 {DrawMenuBarWhenIdle - big for loop} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    menu .m1.apple -tearoff 0
-    menu .m1.help -tearoff 0
-    menu .m1.foo -tearoff 0
-    .m1 add cascade -menu .m1.apple
-    .m1 add cascade -menu .m1.help
-    .m1 add cascade -label Foo -menu .m1.foo
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-18.19 {DrawMenuBarWhenIdle = disabled menu} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    menu .m1.edit -tearoff 0
-    .m1 add cascade -menu .m1.edit -label Edit
-    . configure -menu .m1
-    raise .
-    .m1 entryconfigure Edit -state disabled
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-
-test macMenu-19.1 {RecursivelyInsertMenu} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .m2}
-    catch {destroy .main}
-    catch {destroy .t2}
-    toplevel .t2 -menu .main
-    wm geometry .t2 +0+0
-    menu .main
-    .main add cascade -menu .m1 -label ".m1"
-    menu .m1
-    .m1 add command -label "Test 2"
-    .m1 add cascade -label ".m2" -menu .m2
-    menu .m2
-    .m2 add command -label "Test 3"
-    list [catch {raise .t2} msg] $msg [destroy .t2 .main .m1 .m2]
-} {0 {} {}}
-test macMenu-19.2 {RecursivelyInsertMenu} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .m2}
-    catch {destroy .main}
-    catch {destroy .t2}
-    toplevel .t2 -menu .main
-    wm geometry .t2 +0+0
-    menu .main
-    .main add cascade -menu .m1 -label ".m1"
-    menu .m1
-    .m1 add command -label "Test 2"
-    .m1 add cascade -label ".m2" -menu .m2
-    menu .m2
-    .m2 add command -label "Test 3"
-    list [catch {raise .t2} msg] $msg [destroy .t2 .main .m1 .m2]
-} {0 {} {}}
-
-test macMenu-20.1 {SetDefaultMenuBar} {macOnly} {
-    . configure -menu ""
-    raise .
-    list [catch {update} msg] $msg
-} {0 {}}
-
-test macMenu-21.1 {TkpSetMainMenubar - not front window} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .t2}
-    toplevel .t2
-    wm geometry .t2 +50+50
-    menu .m1
-    raise .
-    update
-    list [catch {.t2 configure -menu .m1} msg] $msg [destroy .t2] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-21.2 {TkpSetMainMenubar - menu null} {macOnly} {
-    . configure -menu ""
-    raise .
-    list [catch {update} msg] $msg
-} {0 {}}
-test macMenu-21.3 {TkpSetMainMenubar - different interps} {macOnly} {
-    catch {destroy .m1}
-    catch {interp delete testinterp}
-    interp create testinterp
-    load {} Tk testinterp
-    menu .m1
-    . configure -menu .m1
-    raise .
-    update
-    interp eval testinterp {menu .m1}
-    interp eval testinterp {. configure -menu .m1}
-    interp eval testinterp {raise .}
-    list [catch {interp eval testinterp {update}} msg] $msg [interp delete testinterp] [. configure -menu ""] [destroy .m1]
-} {0 {} {} {} {}}
-test macMenu-21.4 {TkpSetMainMenubar - different windows} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .t2}
-    menu .m1
-    . configure -menu .m1
-    toplevel .t2
-    wm geometry .t2 +50+50
-    .t2 configure -menu .m1
-    raise .
-    update
-    raise .t2
-    list [catch {update} msg] $msg [destroy .t2] [. configure -menu ""] [destroy .m1]
-} {0 {} {} {} {}}
-test macMenu-21.5 {TkpSetMainMenubar - old menu was null} {macOnly} {
-    catch {destroy .m1}
-    . configure -menu ""
-    update
-    menu .m1
-    . configure -menu .m1
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-test macMenu-21.6 {TkpSetMainMenubar - old menu different} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .m2}
-    menu .m1
-    menu .m2
-    . configure -menu .m1
-    raise .
-    update
-    . configure -menu .m2
-    raise .
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1] [destroy .m2]
-} {0 {} {} {} {}}
-test macMenu-21.7 {TkpSetMainMenubar - child window NULL - parent window now} {macOnly} {
-    catch {destroy .m1}
-    catch {destroy .t2}
-    toplevel .t2 
-    menu .m1
-    .m1 add cascade -label Foo -menu .m1.foo
-    menu .m1.foo
-    .m1.foo add command -label foo
-    . configure -menu .m1
-    raise .t2
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1] [destroy .t2]
-} {0 {} {} {} {}}
-test macMenu-21.8 {TkpSetMainMenubar - tearoff window} {macOnly} {
-    catch {destroy .t2}
-    toplevel .t2 -menu .t2.m1
-    menu .t2.m1
-    .t2.m1 add cascade -label File -menu .t2.m1.foo
-    menu .t2.m1.foo
-    .t2.m1.foo add command -label foo
-    raise .t2
-    tk::TearOffMenu .t2.m1.foo 100 100
-    list [catch {update} msg] $msg [destroy .t2]
-} {0 {} {}}
-
-test macMenu-22.1 {TkSetWindowMenuBar} {macOnly} {
-} {}
-
-test macMenu-23.1 {TkMacDispatchMenuEvent} {macOnly} {
-    # needs to be interactive.
-} {}
-
-test macMenu-24.1 {GetMenuIndicatorGeometry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label foo
-    .m1 invoke foo
-    list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
-} {0 {}}
-
-test macMenu-25.1 {GetMenuAccelGeometry - cascade entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -label foo
-    list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
-} {0 {}}
-test macMenu-25.2 {GetMenuAccelGeometry - no accel} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command
-    list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
-} {0 {}}
-test macMenu-25.3 {GetMenuAccelGeometry - no special chars - arbitrary string} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -accel "Test"
-    list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
-} {0 {}}
-test macMenu-25.4 {GetMenuAccelGeometry - Command} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel "Cmd+S"
-    list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
-} {0 {}}
-test macMenu-25.5 {GetMenuAccelGeometry - Control} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel "Ctrl+S"
-    list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
-} {0 {}}
-test macMenu-25.6 {GetMenuAccelGeometry - Shift} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel "Shift+S"
-    list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
-} {0 {}}
-test macMenu-25.7 {GetMenuAccelGeometry - Option} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel "Opt+S"
-    list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
-} {0 {}}
-test macMenu-25.8 {GetMenuAccelGeometry - Combination} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel "Cmd+Shift+S"
-    list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
-} {0 {}}
-test macMenu-25.9 {GetMenuAccelGeometry - extra text} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel "Command+Delete"
-    list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
-} {0 {}}
-    
-test macMenu-26.1 {GetTearoffEntryGeometry} {macOnly} {
-    # can't call this on power mac.
-} {}
-
-test macMenu-27.1 {GetMenuSeparatorGeometry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add separator
-    list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
-} {0 {}}
-
-test macMenu-28.1 {DrawMenuEntryIndicator - non-checkbutton} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-28.2 {DrawMenuEntryIndicator - indicator off} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label foo -indicatoron 0
-    .m1 invoke foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-28.3 {DrawMenuEntryIndicator - not selected} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-28.4 {DrawMenuEntryIndicator - checkbutton} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label foo
-    .m1 invoke foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-28.5 {DrawMenuEntryIndicator - radiobutton} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add radiobutton -label foo
-    .m1 invoke foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-
-# Cannot reproduce resources missing or color allocation failing easily.
-test macMenu-29.1 {DrawSICN} {macOnly} {
-   catch {destroy .m1}
-   menu .m1
-   .m1 add command -label foo -accel "Cmd+S"
-   set tearoff [tk::TearOffMenu .m1 40 40]
-   list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-
-# Cannot reproduce resources missing
-test macMenu-30.1 {DrawMenuEntryAccelerator - cascade entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-30.2 {DrawMenuEntryAccelerator - no accel string} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-30.3 {DrawMenuEntryAccelerator - random accel string} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-30.4 {DrawMenuEntryAccelerator - Command} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel "Cmd+S"
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-30.5 {DrawMenuEntryAccelerator - Option} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel "Opt+S"
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-30.6 {DrawMenuEntryAccelerator - Shift} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel "Shift+S"
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-30.7 {DrawMenuEntryAccelerator - Control} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel "Ctrl+S"
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-test macMenu-30.8 {DrawMenuEntryAccelerator - combination} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -accel "Cmd+Shift+S"
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-
-test macMenu-31.1 {DrawMenuSeparator} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add separator
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-
-test macMenu-32.1 {TkpDrawMenuEntryLabel} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [catch {update} msg] $msg [destroy .m1]
-} {0 {} {}}
-
-test macMenu-33.1 {MenuDefProc - No way to test automatically.} {} {}
-test macMenu-34.1 {TkMacHandleTearoffMenu - no way to test automatically} {} {}
-test macMenu-35.1 {TkpInitializeMenuBindings - nothing to do} {} {}
-
-test macMenu-36.1 {TkpComputeMenubarGeometry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -label foo
-    . configure -menu .m1
-    list [catch {update} msg] $msg [. configure -menu ""] [destroy .m1]
-} {0 {} {} {}}
-
-test macMenu-37.1 {DrawTearoffEntry - can't do automatically} {} {}
-test macMenu-38.1 {TkMacSetHelpMenuItemCount - called at boot time} {} {}
-test macMenu-39.1 {TkMacMenuClick - can't do automatically} {} {}
-
-test macMenu-40.1 {TkpDrawMenuEntry - gc for active and not strict motif} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    .m1 entryconfigure 1 -state active
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.2 {TkpDrawMenuEntry - gc for active menu item with its own gc} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -activeforeground red
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    .m1 entryconfigure 1 -state active
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.3 {TkpDrawMenuEntry - gc for active and strict motif} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    set tk_strictMotif 1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    .m1 entryconfigure 1 -state active
-    list [update] [destroy .m1] [set tk_strictMotif 0]
-} {{} {} 0}
-test macMenu-40.4 {TkpDrawMenuEntry - gc for disabled with disabledfg and custom entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -disabledforeground blue
-    .m1 add command -label foo -state disabled -background red
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.5 {TkpDrawMenuEntry - gc for disabled with disabledFg} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -disabledforeground blue
-    .m1 add command -label foo -state disabled
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.6 {TkpDrawMenuEntry - gc for disabled - no disabledFg} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -disabledforeground ""
-    .m1 add command -label foo -state disabled
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.7 {TkpDrawMenuEntry - gc for normal - custom entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -foreground red
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.8 {TkpDrawMenuEntry - gc for normal} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.9 {TkpDrawMenuEntry - gc for indicator - custom entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label foo -selectcolor orange
-    .m1 invoke 1
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.10 {TkpDrawMenuEntry - gc for indicator} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label foo
-    .m1 invoke 1
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.11 {TkpDrawMenuEntry - border - custom entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -activebackground green
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    .m1 entryconfigure 1 -state active
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.12 {TkpDrawMenuEntry - border} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    .m1 entryconfigure 1 -state active
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.13 {TkpDrawMenuEntry - active border - strict motif} {macOnly} {
-    catch {destroy .m1}
-    set tk_strictMotif 1
-    menu .m1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    .m1 entryconfigure 1 -state active
-    list [update] [destroy .m1] [set tk_strictMotif 0]
-} {{} {} 0}
-test macMenu-40.14 {TkpDrawMenuEntry - active border - custom entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -activeforeground yellow
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    .m1 entryconfigure 1 -state active
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.15 {TkpDrawMenuEntry - active border} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    .m1 entryconfigure 1 -state active
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.16 {TkpDrawMenuEntry - font - custom entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo -font "Helvectica 72"
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.17 {TkpDrawMenuEntry - font} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -font "Courier 72"
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.18 {TkpDrawMenuEntry - separator} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add separator
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.19 {TkpDrawMenuEntry - standard} {macOnly} {
-    catch {destroy .mb}
-    menu .m1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.20 {TkpDrawMenuEntry - disabled cascade item} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add cascade -label File -menu .m1.file
-    menu .m1.file
-    .m1.file add command -label foo
-    .m1 entryconfigure File -state disabled
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.21 {TkpDrawMenuEntry - indicator} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label macMenu-40.20
-    .m1 invoke 0
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-40.22 {TkpDrawMenuEntry - indicator - hideMargin} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label macMenu-40.21 -hidemargin 1
-    .m1 invoke 0
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-
-test macMenu-41.1 {TkpComputeStandardMenuGeometry - no entries} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.2 {TkpComputeStandardMenuGeometry - one entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "one"
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.3 {TkpComputeStandardMenuGeometry - more than one entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "one"
-    .m1 add command -label "two"
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.4 {TkpComputeStandardMenuGeometry - separator} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add separator
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.5 {TkpComputeStandardMenuGeometry - standard label geometry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "test"
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.6 {TkpComputeStandardMenuGeometry - different font for entry} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -font "Helvetica 12"
-    .m1 add command -label "test" -font "Courier 12"
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.7 {TkpComputeStandardMenuGeometry - second entry larger} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "test"
-    .m1 add command -label "test test"
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.8 {TkpComputeStandardMenuGeometry - first entry larger} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "test test"
-    .m1 add command -label "test"
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.9 {TkpComputeStandardMenuGeometry - accelerator} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "test" -accel "Ctrl+S"
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.10 {TkpComputeStandardMenuGeometry - second accel larger} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "test" -accel "1"
-    .m1 add command -label "test" -accel "1 1"
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.11 {TkpComputeStandardMenuGeometry - second accel smaller} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "test" -accel "1 1"
-    .m1 add command -label "test" -accel "1"
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.12 {TkpComputeStandardMenuGeometry - indicator} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label test
-    .m1 invoke 1
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.13 {TkpComputeStandardMenuGeometry - second indicator less or equal } {macOnly testImageType} {
-    catch {destroy .m1}
-    catch {image delete image1}
-    image create test image1
-    menu .m1
-    .m1 add checkbutton -image image1
-    .m1 invoke 1
-    .m1 add checkbutton -label test
-    .m1 invoke 2
-    list [update idletasks] [destroy .m1] [image delete image1]
-} {{} {} {}}
-test macMenu-41.14 {TkpComputeStandardMenuGeometry - hidden margin} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add checkbutton -label macMenu-41.15 -hidemargin 1
-    .m1 invoke macMenu-41.15
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.15 {TkpComputeStandardMenuGeometry - zero sized menus} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.16 {TkpComputeStandardMenuGeometry - first column bigger} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label one
-    .m1 add command -label two
-    .m1 add command -label three -columnbreak 1
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.17 {TkpComputeStandardMenuGeometry - second column bigger} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add command -label one
-    .m1 add command -label two -columnbreak 1
-    .m1 add command -label three
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.18 {TkpComputeStandardMenuGeometry - three columns} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add command -label one
-    .m1 add command -label two -columnbreak 1
-    .m1 add command -label three
-    .m1 add command -label four
-    .m1 add command -label five -columnbreak 1
-    .m1 add command -label six
-    list [update idletasks] [destroy .m1]    
-} {{} {}}
-test macMenu-41.19 {TkpComputeStandardMenuGeometry - entry without accel long} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add command -label "This is a long item with no accel."
-    .m1 add command -label foo -accel "Cmd+S"
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-41.20 {TkpComputeStandardMenuGeometry - entry with accel long} {macOnly} {
-    catch {destroy .m1}
-    menu .m1 -tearoff 0
-    .m1 add command -label foo
-    .m1 add command -label "This is a long label with an accel." -accel "Cmd+W"
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-
-test macMenu-42.1 {DrawMenuEntryLabel - setting indicatorSpace} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "foo"
-    set tearoff [tk::TearOffMenu .m1]
-    list [update idletasks] [destroy .m1]    
-} {{} {}}
-test macMenu-42.2 {DrawMenuEntryLabel - drawing image} {macOnly testImageType} {
-    catch {destroy .m1}
-    catch {image delete image1}
-    image create test image1
-    menu .m1
-    .m1 add command -image image1
-    set tearoff [tk::TearOffMenu .m1]
-    list [update idletasks] [destroy .m1] [image delete image1]
-} {{} {} {}}
-test macMenu-42.3 {DrawMenuEntryLabel - drawing select image} {macOnly testImageType} {
-    catch {destroy .m1}
-    catch {eval image delete [image names]}
-    image create test image1
-    image create test image2
-    menu .m1
-    .m1 add checkbutton -image image1 -selectimage image2
-    .m1 invoke 1
-    set tearoff [tk::TearOffMenu .m1]
-    list [update idletasks] [destroy .m1] [eval image delete [image names]]
-} {{} {} {}}
-test macMenu-42.4 {DrawMenuEntryLabel - drawing a bitmap} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -bitmap questhead
-    set tearoff [tk::TearOffMenu .m1]
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-42.5 {DrawMenuEntryLabel - drawing null label} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command
-    set tearoff [tk::TearOffMenu .m1]
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-42.6 {DrawMenuEntryLabel - drawing real label} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "This is a long label" -underline 3
-    set tearoff [tk::TearOffMenu .m1]
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-42.7 {DrawMenuEntryLabel - drawing disabled label} {macOnly} {
-	catch {destroy .m1}
-	menu .m1 -disabledforeground ""
-	.m1 add command -label "This is a long label" -state disabled
-	set tearoff [tk::TearOffMenu .m1]
-	list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-42.8 {DrawMenuEntryLabel - disabled images} {macOnly testImageType} {
-	catch {destroy .m1}
-	catch {image delete image1}
-	image create test image1
-	menu .m1
-	.m1 add command -image image1 -state disabled
-	set tearoff [tk::TearOffMenu .m1 100 100]
-	list [update idletasks] [destroy .m1] [image delete image1]
-} {{} {} {}}
-
-test macMenu-43.1 {GetMenuLabelGeometry - image} {macOnly testImageType} {
-    catch {destroy .m1}
-    catch {image delete image1}
-    menu .m1
-    image create test image1
-    .m1 add command -image image1
-    list [update idletasks] [destroy .m1] [image delete image1]
-} {{} {} {}}
-test macMenu-43.2 {GetMenuLabelGeometry - bitmap} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -bitmap questhead
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-43.3 {GetMenuLabelGeometry - no text} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-test macMenu-43.4 {GetMenuLabelGeometry - text} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label "This is a test."
-    list [update idletasks] [destroy .m1]
-} {{} {}}
-
-test macMenu-44.1 {DrawMenuEntryBackground} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    list [update] [destroy .m1]
-} {{} {}}
-test macMenu-44.2 {DrawMenuEntryBackground} {macOnly} {
-    catch {destroy .m1}
-    menu .m1
-    .m1 add command -label foo
-    set tearoff [tk::TearOffMenu .m1 40 40]
-    $tearoff activate 0
-    list [update] [destroy .m1]
-} {{} {}}
-
-test macMenu-45.1 {TkpMenuInit - called at boot time} {macOnly} {
-} {}
-
-# cleanup
-deleteWindows
-::tcltest::cleanupTests
-return
diff --git a/tests/macscrollbar.test b/tests/macscrollbar.test
deleted file mode 100644
index c8cc214..0000000
--- a/tests/macscrollbar.test
+++ /dev/null
@@ -1,93 +0,0 @@
-# This file is a Tcl script to test out scrollbar widgets and
-# the "scrollbar" command of Tk.  This file only tests Macintosh
-# specific features.  It is organized in the standard fashion for 
-# Tcl tests.
-#
-# Copyright (c) 1996 Sun Microsystems, Inc.
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# All rights reserved.
-
-package require tcltest 2.1
-namespace import -force tcltest::configure
-namespace import -force tcltest::testsDirectory
-configure -testdir [file join [pwd] [file dirname [info script]]]
-configure -loadfile [file join [testsDirectory] constraints.tcl]
-tcltest::loadTestedCommands
-
-update
-
-# Tests for display and layout
-wm geometry . 50x300
-scrollbar .s
-pack .s -fill y -expand 1
-update
-test macscroll-1.1 {TkpDisplayScrollbar procedure} {macOnly} {
-    list [.s configure -width] [.s configure -bd]
-} {{-width width Width 16 16} {-borderwidth borderWidth BorderWidth 0 0}}
-test macscroll-1.2 {TkpDisplayScrollbar procedure} {macOnly} {
-    # Exercise drawing 3D relief
-    pack .s -fill y -expand 1 -anchor center
-    .s configure -bd 4
-    update
-    focus .s
-    update
-} {}
-test macscroll-1.3 {TkpDisplayScrollbar procedure} {macOnly} {
-    pack .s -fill y -expand 1 -anchor e
-    update
-    set x [.s configure -width]
-    pack .s -fill y -expand 1 -anchor w
-    update
-    list [.s configure -width] $x
-} {{-width width Width 16 16} {-width width Width 16 16}}
-test macscroll-1.4 {TkpDisplayScrollbar procedure} {macOnly} {
-    wm geometry . 300x50
-    .s configure -bd 0 -orient horizontal
-    pack .s -fill x -expand 1 -anchor center
-    update
-    set x [.s configure -width]
-    pack .s -fill x -expand 1 -anchor n
-    update
-    set y [.s configure -width]
-    pack .s -fill x -expand 1 -anchor s
-    update
-    list [.s configure -width] $x $y
-} {{-width width Width 16 16} {-width width Width 16 16} {-width width Width 16 16}}
-test macscroll-1.5 {TkpDisplayScrollbar procedure} {macOnly} {
-    wm geometry . 300x16
-    .s configure -bd 0 -orient horizontal
-    pack .s -fill x -expand 1 -anchor s
-    update
-    wm geometry . 300x15
-    update
-    wm geometry . 300x14
-    update
-} {}
-test macscroll-1.6 {TkpDisplayScrollbar procedure} {macOnly} {
-    # Check the drawing of the resize hack
-    wm geometry . 20x300
-    wm resizable . 1 1
-    .s configure -bd 0 -orient vertical
-    pack .s -fill y -expand 1 -anchor e
-    update
-    set x [.s identify 12 295]
-    wm resizable . 0 0
-    update
-    set y [.s identify 12 295]
-    wm resizable . 1 1
-    pack .s -fill y -expand 1 -anchor center
-    update
-    list $x $y [.s identify 12 295]
-} {{} arrow2 arrow2}
-test macscroll-1.7 {TkpDisplayScrollbar procedure} {macOnly} {
-    wm geometry . 300x300
-    pack .s -fill y -expand 1 -anchor e
-    catch {destroy .s2}
-    scrollbar .s2 -orient horizontal
-    place .s2 -x 0 -y 284 -width 300
-} {}
-
-deleteWindows
-# cleanup
-::tcltest::cleanupTests
-return
diff --git a/tests/safe.test b/tests/safe.test
index 10c8b29..ad5f356 100644
--- a/tests/safe.test
+++ b/tests/safe.test
@@ -35,9 +35,7 @@ tcltest::loadTestedCommands
 
 # The set of hidden commands is platform dependent:
 
-if {"$tcl_platform(platform)" == "macintosh"} {
-    set hidden_cmds {beep bell cd clipboard echo encoding exit fconfigure file glob grab load ls menu open pwd selection send socket source tk_chooseColor tk_chooseDirectory tk_getOpenFile tk_getSaveFile toplevel wm}
-} elseif {"$tcl_platform(platform)" == "windows"} {
+if {"$tcl_platform(platform)" == "windows"} {
     set hidden_cmds {bell cd clipboard encoding exec exit fconfigure file glob grab load menu open pwd selection socket source tk_chooseColor tk_chooseDirectory tk_getOpenFile tk_getSaveFile tk_messageBox toplevel wm}
 } else {
     set hidden_cmds {bell cd clipboard encoding exec exit fconfigure file glob grab load menu open pwd selection send socket source toplevel wm}
diff --git a/tests/text.test b/tests/text.test
index bf70658..62136ca 100644
--- a/tests/text.test
+++ b/tests/text.test
@@ -130,9 +130,7 @@ test text-2.4 {Tk_TextCmd procedure} {
     list [catch {text .t2 -bd 2 -fg red} msg] $msg \
 	[lindex [.t2 config -bd] 4] [lindex [.t2 config -fg] 4]
 } {0 .t2 2 red}
-if {$tcl_platform(platform) == "macintosh"} {
-    set relief solid
-} elseif {$tcl_platform(platform) == "windows"} {
+if {$tcl_platform(platform) == "windows"} {
     set relief flat
 } else {
     set relief raised
diff --git a/tests/unixMenu.test b/tests/unixMenu.test
index a43f6f5..44b1a06 100644
--- a/tests/unixMenu.test
+++ b/tests/unixMenu.test
@@ -1,7 +1,5 @@
 # This file is a Tcl script to test menus in Tk.  It is
-# organized in the standard fashion for Tcl tests. This
-# file tests the Macintosh-specific features of the menu
-# system.
+# organized in the standard fashion for Tcl tests.
 #
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
diff --git a/tests/winMenu.test b/tests/winMenu.test
index f29face..456498a 100644
--- a/tests/winMenu.test
+++ b/tests/winMenu.test
@@ -1,7 +1,5 @@
 # This file is a Tcl script to test menus in Tk.  It is
-# organized in the standard fashion for Tcl tests. This
-# file tests the Macintosh-specific features of the menu
-# system.
+# organized in the standard fashion for Tcl tests.
 #
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.