Use standard constraint names

1 files changed, 143 insertions, 149 deletions

diff --git a/tests/winMenu.test b/tests/winMenu.test
index 0c56507..01ed0c5 100644
--- a/tests/winMenu.test
+++ b/tests/winMenu.test
@@ -7,29 +7,29 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 #
-# RCS: @(#) $Id: winMenu.test,v 1.8 2004/05/23 17:34:49 dkf Exp $
+# RCS: @(#) $Id: winMenu.test,v 1.9 2004/06/24 12:45:44 dkf Exp $
 
 package require tcltest 2.1
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
-test winMenu-1.1 {GetNewID} {pcOnly} {
+test winMenu-1.1 {GetNewID} win {
     catch {destroy .m1}
     list [catch {menu .m1} msg] $msg [destroy .m1]
 } {0 .m1 {}}
 # Basically impossible to test menu IDs wrapping.
 
-test winMenu-2.1 {FreeID} {pcOnly} {
+test winMenu-2.1 {FreeID} win {
     catch {destroy .m1}
     menu .m1
     list [catch {destroy .m1} msg] $msg
 } {0 {}}
 
-test winMenu-3.1 {TkpNewMenu} {pcOnly} {
+test winMenu-3.1 {TkpNewMenu} win {
     catch {destroy .m1}
     list [catch {menu .m1} msg] $msg [catch {destroy .m1} msg2] $msg2
 } {0 .m1 0 {}}
-test winMenu-3.2 {TkpNewMenu} {pcOnly} {
+test winMenu-3.2 {TkpNewMenu} win {
     catch {destroy .m1}
     . configure -menu ""
     menu .m1
@@ -37,12 +37,12 @@ test winMenu-3.2 {TkpNewMenu} {pcOnly} {
     list [catch {. configure -menu .m1} msg] $msg [. configure -menu ""] [catch {destroy .m1} msg2] $msg2
 } {0 {} {} 0 {}}
 
-test winMenu-4.1 {TkpDestroyMenu} {pcOnly} {
+test winMenu-4.1 {TkpDestroyMenu} win {
     catch {destroy .m1}
     menu .m1
     list [catch {destroy .m1} msg] $msg
 } {0 {}}
-test winMenu-4.2 {TkpDestroyMenu - help menu} {pcOnly} {
+test winMenu-4.2 {TkpDestroyMenu - help menu} win {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -menu .m1.system
@@ -50,7 +50,7 @@ test winMenu-4.2 {TkpDestroyMenu - help menu} {pcOnly} {
     list [catch {destroy .m1.system} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
 
-test winMenu-5.1 {TkpDestroyMenuEntry} {pcOnly} {
+test winMenu-5.1 {TkpDestroyMenuEntry} win {
     catch {destroy .m1}
     . configure -menu ""
     menu .m1
@@ -59,89 +59,89 @@ test winMenu-5.1 {TkpDestroyMenuEntry} {pcOnly} {
     list [catch {.m1 delete 1} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-6.1 {GetEntryText} {pcOnly} {
+test winMenu-6.1 {GetEntryText} win {
     catch {destroy .m1}
     list [catch {menu .m1} msg] $msg [destroy .m1]
 } {0 .m1 {}}
-test winMenu-6.2 {GetEntryText} {testImageType pcOnly} {
+test winMenu-6.2 {GetEntryText} {testImageType win} {
     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 winMenu-6.3 {GetEntryText} {pcOnly} {
+test winMenu-6.3 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -bitmap questhead} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.4 {GetEntryText} {pcOnly} {
+test winMenu-6.4 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.5 {GetEntryText} {pcOnly} {
+test winMenu-6.5 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "foo"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.6 {GetEntryText} {pcOnly} {
+test winMenu-6.6 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "This string has one & in it"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.7 {GetEntryText} {pcOnly} {
+test winMenu-6.7 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The & should be underlined." -underline 4} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.8 {GetEntryText} {pcOnly} {
+test winMenu-6.8 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The * should be underlined." -underline 4} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.9 {GetEntryText} {pcOnly} {
+test winMenu-6.9 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "foo" -accel "bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.10 {GetEntryText} {pcOnly} {
+test winMenu-6.10 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "This string has one & in it" -accel "bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.11 {GetEntryText} {pcOnly} {
+test winMenu-6.11 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The & should be underlined." -underline 4 -accel "bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.12 {GetEntryText} {pcOnly} {
+test winMenu-6.12 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The * should be underlined." -underline 4 -accel "bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.13 {GetEntryText} {pcOnly} {
+test winMenu-6.13 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "foo" -accel "&bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.14 {GetEntryText} {pcOnly} {
+test winMenu-6.14 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "This string has one & in it" -accel "&bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.15 {GetEntryText} {pcOnly} {
+test winMenu-6.15 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The & should be underlined." -underline 4 -accel "&bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-6.16 {GetEntryText} {pcOnly} {
+test winMenu-6.16 {GetEntryText} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command -label "The * should be underlined." -underline 4 -accel "&bar"} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-7.1 {ReconfigureWindowsMenu - system menu item removal} {pcOnly} {
+test winMenu-7.1 {ReconfigureWindowsMenu - system menu item removal} win {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -menu .m1.system
@@ -151,7 +151,7 @@ test winMenu-7.1 {ReconfigureWindowsMenu - system menu item removal} {pcOnly} {
     .m1.system add command -label bar
     list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test winMenu-7.2 {ReconfigureWindowsMenu - menu item removal} {pcOnly} {
+test winMenu-7.2 {ReconfigureWindowsMenu - menu item removal} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label Hello
@@ -159,77 +159,77 @@ test winMenu-7.2 {ReconfigureWindowsMenu - menu item removal} {pcOnly} {
     .m1 add command -label foo
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.3 {ReconfigureWindowsMenu - zero items} {pcOnly} {
+test winMenu-7.3 {ReconfigureWindowsMenu - zero items} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label Hello
     .m1 delete Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.4 {ReconfigureWindowsMenu - one item} {pcOnly} {
+test winMenu-7.4 {ReconfigureWindowsMenu - one item} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.5 {ReconfigureWindowsMenu - two items} {pcOnly} {
+test winMenu-7.5 {ReconfigureWindowsMenu - two items} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label One
     .m1 add command -label Two
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.6 {ReconfigureWindowsMenu - separator item} {pcOnly} {
+test winMenu-7.6 {ReconfigureWindowsMenu - separator item} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add separator
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.7 {ReconfigureWindowsMenu - non-text item} {pcOnly} {
+test winMenu-7.7 {ReconfigureWindowsMenu - non-text item} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.8 {ReconfigureWindowsMenu - disabled item} {pcOnly} {
+test winMenu-7.8 {ReconfigureWindowsMenu - disabled item} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label Hello -state disabled
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.9 {ReconfigureWindowsMenu - non-selected checkbutton} {pcOnly} {
+test winMenu-7.9 {ReconfigureWindowsMenu - non-selected checkbutton} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add checkbutton -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.10 {ReconfigureWindowsMenu - non-selected radiobutton} {pcOnly} {
+test winMenu-7.10 {ReconfigureWindowsMenu - non-selected radiobutton} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add radiobutton -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.11 {ReconfigureWindowsMenu - selected checkbutton} {pcOnly} {
+test winMenu-7.11 {ReconfigureWindowsMenu - selected checkbutton} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add checkbutton -label Hello
     .m1 invoke Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.12 {ReconfigureWindowsMenu - selected radiobutton} {pcOnly} {
+test winMenu-7.12 {ReconfigureWindowsMenu - selected radiobutton} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add radiobutton -label Hello
     .m1 invoke Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.13 {ReconfigureWindowsMenu - cascade missing} {pcOnly} {
+test winMenu-7.13 {ReconfigureWindowsMenu - cascade missing} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-7.14 {ReconfigureWindowsMenu - cascade} {pcOnly} {
+test winMenu-7.14 {ReconfigureWindowsMenu - cascade} win {
     catch {destroy .m1}
     catch {destroy .m2}
     menu .m1 -tearoff 0
@@ -237,7 +237,7 @@ test winMenu-7.14 {ReconfigureWindowsMenu - cascade} {pcOnly} {
     .m1 add cascade -menu .m2 -label Hello
     list [catch {update idletasks} msg] $msg [destroy .m1] [destroy .m2]
 } {0 {} {} {}}
-test winMenu-7.15 {ReconfigureWindowsMenu - menubar without system menu} {pcOnly} {
+test winMenu-7.15 {ReconfigureWindowsMenu - menubar without system menu} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -menu .m1.file
@@ -245,7 +245,7 @@ test winMenu-7.15 {ReconfigureWindowsMenu - menubar without system menu} {pcOnly
     . configure -menu .m1
     list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test winMenu-7.16 {ReconfigureWindowsMenu - system menu already created} {pcOnly} {
+test winMenu-7.16 {ReconfigureWindowsMenu - system menu already created} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -menu .m1.system
@@ -255,7 +255,7 @@ test winMenu-7.16 {ReconfigureWindowsMenu - system menu already created} {pcOnly
     .m1.system add command -label Hello
     list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test winMenu-7.17 {ReconfigureWindowsMenu - system menu update pending} {pcOnly} {
+test winMenu-7.17 {ReconfigureWindowsMenu - system menu update pending} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -menu .m1.system
@@ -263,7 +263,7 @@ test winMenu-7.17 {ReconfigureWindowsMenu - system menu update pending} {pcOnly}
     . configure -menu .m1
     list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test winMenu-7.18 {ReconfigureWindowsMenu - system menu update not pending} {pcOnly} {
+test winMenu-7.18 {ReconfigureWindowsMenu - system menu update not pending} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add cascade -menu .m1.system
@@ -273,7 +273,7 @@ test winMenu-7.18 {ReconfigureWindowsMenu - system menu update not pending} {pcO
     . configure -menu .m1
     list [catch {update idletasks} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
-test winMenu-7.19 {ReconfigureWindowsMenu - column break} {pcOnly} {
+test winMenu-7.19 {ReconfigureWindowsMenu - column break} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label one
@@ -282,23 +282,23 @@ test winMenu-7.19 {ReconfigureWindowsMenu - column break} {pcOnly} {
 } {0 {} {}}
 
 #Don't know how to generate nested post menus
-test winMenu-8.1 {TkpPostMenu} {pcOnly} {
+test winMenu-8.1 {TkpPostMenu} win {
     catch {destroy .m1}
     menu .m1 -postcommand "blork"
     list [catch {.m1 post 40 40} msg] $msg [destroy .m1]
 } {1 {invalid command name "blork"} {}}
-test winMenu-8.2 {TkpPostMenu} {pcOnly} {
+test winMenu-8.2 {TkpPostMenu} win {
     catch {destroy .m1}
     menu .m1 -postcommand "destroy .m1"
     list [.m1 post 40 40] [winfo exists .m1]
 } {{} 0}
-test winMenu-8.3 {TkpPostMenu - popup menu} {pcOnly userInteraction} {
+test winMenu-8.3 {TkpPostMenu - popup menu} {win userInteraction} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-8.3: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
-test winMenu-8.4 {TkpPostMenu - menu button} {pcOnly userInteraction} {
+test winMenu-8.4 {TkpPostMenu - menu button} {win userInteraction} {
     catch {destroy .mb}
     menubutton .mb -text test -menu .mb.menu
     menu .mb.menu
@@ -306,7 +306,7 @@ test winMenu-8.4 {TkpPostMenu - menu button} {pcOnly userInteraction} {
     pack .mb
     list [tk::MbPost .mb] [destroy .m1]
 } {{} {}}
-test winMenu-8.5 {TkpPostMenu - update not pending} {pcOnly userInteraction} {
+test winMenu-8.5 {TkpPostMenu - update not pending} {win userInteraction} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-8.5 - Hit ESCAPE."
@@ -314,13 +314,13 @@ test winMenu-8.5 {TkpPostMenu - update not pending} {pcOnly userInteraction} {
     list [catch {.m1 post 40 40} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-9.1 {TkpMenuNewEntry} {pcOnly} {
+test winMenu-9.1 {TkpMenuNewEntry} win {
     catch {destroy .m1}
     menu .m1
     list [catch {.m1 add command} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-10.1 {TkwinMenuProc} {pcOnly userInteraction} {
+test winMenu-10.1 {TkwinMenuProc} {win userInteraction} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-10.1: Hit ESCAPE."
@@ -328,21 +328,21 @@ test winMenu-10.1 {TkwinMenuProc} {pcOnly userInteraction} {
 } {{} {}}
 
 # Can't generate a WM_INITMENU without a Tk menu yet.
-test winMenu-11.1 {TkWinHandleMenuEvent - WM_INITMENU} {pcOnly userInteraction} {
+test winMenu-11.1 {TkWinHandleMenuEvent - WM_INITMENU} {win userInteraction} {
     catch {destroy .m1}
     catch {unset foo}
     menu .m1 -postcommand "set foo test"
     .m1 add command -label "winMenu-11.1: Hit ESCAPE."
     list [.m1 post 40 40] [set foo] [unset foo] [destroy .m1]
 } {test test {} {}}
-test winMenu-11.2 {TkWinHandleMenuEvent - WM_COMMAND} {pcOnly userInteraction} {
+test winMenu-11.2 {TkWinHandleMenuEvent - WM_COMMAND} {win userInteraction} {
     catch {destroy .m1}
     catch {unset foo}
     menu .m1
     .m1 add checkbutton -variable foo -label "winMenu-11.2: Please select this menu item."
     list [.m1 post 40 40] [update] [set foo] [unset foo] [destroy .m1]
 } {{} {} 1 {} {}}
-test winMenu-11.3 {TkWinHandleMenuEvent - WM_COMMAND} {pcOnly userInteraction} {
+test winMenu-11.3 {TkWinHandleMenuEvent - WM_COMMAND} {win userInteraction} {
     catch {destroy .m1}
     catch {unset foo}
     proc bgerror {args} {
@@ -358,33 +358,33 @@ test winMenu-11.3 {TkWinHandleMenuEvent - WM_COMMAND} {pcOnly userInteraction} {
     (menu invoke)}} {} {}}
 
 # Can't test WM_MENUCHAR
-test winMenu-11.4 {TkWinHandleMenuEvent - WM_MEASUREITEM} {pcOnly userInteraction} {
+test winMenu-11.4 {TkWinHandleMenuEvent - WM_MEASUREITEM} {win userInteraction} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-11.3: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
-test winMenu-11.5 {TkWinHandleMenuEvent - WM_MEASUREITEM} {pcOnly userInteraction} {
+test winMenu-11.5 {TkWinHandleMenuEvent - WM_MEASUREITEM} {win userInteraction} {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label "winMenu-11.4: Hit ESCAPE" -hidemargin 1
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
-test winMenu-11.6 {TkWinHandleMenuEvent - WM_DRAWITEM} {pcOnly userInteraction} {
+test winMenu-11.6 {TkWinHandleMenuEvent - WM_DRAWITEM} {win userInteraction} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-11.5: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
 test winMenu-11.7 {TkWinHandleMenuEvent - WM_DRAWITEM - item disabled} \
-	{pcOnly userInteraction} {
+	{win userInteraction} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-11.6: Hit ESCAPE." -state disabled
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
 test winMenu-11.8 {TkWinHandleMenuEvent - WM_INITMENU - not pending} \
-	{pcOnly userInteraction} {
+	{win userInteraction} {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label "winMenu-11.7: Hit ESCAPE"
@@ -392,14 +392,14 @@ test winMenu-11.8 {TkWinHandleMenuEvent - WM_INITMENU - not pending} \
     list [catch {.m1 post 40 40} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-12.1 {TkpSetWindowMenuBar} {pcOnly} {
+test winMenu-12.1 {TkpSetWindowMenuBar} win {
     catch {destroy .m1}
     . configure -menu ""
     menu .m1
     .m1 add command -label foo
     list [catch {. configure -menu .m1} msg] $msg [. configure -menu ""] [catch {destroy .m1} msg2] $msg2
 } {0 {} {} 0 {}}
-test winMenu-12.2 {TkpSetWindowMenuBar} {pcOnly} {
+test winMenu-12.2 {TkpSetWindowMenuBar} win {
     catch {destroy .m1}
     . configure -menu ""
     menu .m1
@@ -407,7 +407,7 @@ test winMenu-12.2 {TkpSetWindowMenuBar} {pcOnly} {
     . configure -menu .m1
     list [catch {. configure -menu ""} msg] $msg [catch {destroy .m1} msg2] $msg2
 } {0 {} 0 {}}
-test winMenu-12.3 {TkpSetWindowMenuBar - no update pending} {pcOnly} {
+test winMenu-12.3 {TkpSetWindowMenuBar - no update pending} win {
     catch {destroy .m1}
     . configure -menu ""
     menu .m1 -tearoff 0
@@ -416,48 +416,48 @@ test winMenu-12.3 {TkpSetWindowMenuBar - no update pending} {pcOnly} {
     list [catch {. configure -menu .m1} msg] $msg [. configure -menu ""] [destroy .m1]
 } {0 {} {} {}}
 
-test winMenu-13.1 {TkpSetMainMenubar - nothing to do} {emptyTest pcOnly} {} {}
+test winMenu-13.1 {TkpSetMainMenubar - nothing to do} {emptyTest win} {} {}
 
-test winMenu-14.1 {GetMenuIndicatorGeometry} {pcOnly} {
+test winMenu-14.1 {GetMenuIndicatorGeometry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test winMenu-14.2 {GetMenuIndicatorGeometry} {pcOnly} {
+test winMenu-14.2 {GetMenuIndicatorGeometry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo -hidemargin 1
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
 
-test winMenu-15.1 {GetMenuAccelGeometry} {pcOnly} {
+test winMenu-15.1 {GetMenuAccelGeometry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label foo -accel Ctrl+U
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test winMenu-15.2 {GetMenuAccelGeometry} {pcOnly} {
+test winMenu-15.2 {GetMenuAccelGeometry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
-test winMenu-15.3 {GetMenuAccelGeometry} {pcOnly} {
+test winMenu-15.3 {GetMenuAccelGeometry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -accel "Ctrl+U"
     list [catch {tk::TearOffMenu .m1 40 40}] [destroy .m1]
 } {0 {}}
 
-test winMenu-16.1 {GetTearoffEntryGeometry} {pcOnly userInteraction} {
+test winMenu-16.1 {GetTearoffEntryGeometry} {win userInteraction} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-19.1: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
 
-test winMenu-17.1 {GetMenuSeparatorGeometry} {pcOnly} {
+test winMenu-17.1 {GetMenuSeparatorGeometry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
@@ -466,7 +466,7 @@ test winMenu-17.1 {GetMenuSeparatorGeometry} {pcOnly} {
 
 # Currently, the only callers to DrawWindowsSystemBitmap want things
 # centered vertically, and either centered or right aligned horizontally.
-test winMenu-18.1 {DrawWindowsSystemBitmap - center aligned} {pcOnly} {
+test winMenu-18.1 {DrawWindowsSystemBitmap - center aligned} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
@@ -474,7 +474,7 @@ test winMenu-18.1 {DrawWindowsSystemBitmap - center aligned} {pcOnly} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-18.2 {DrawWindowsSystemBitmap - right aligned} {pcOnly} {
+test winMenu-18.2 {DrawWindowsSystemBitmap - right aligned} win {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label foo
@@ -483,21 +483,21 @@ test winMenu-18.2 {DrawWindowsSystemBitmap - right aligned} {pcOnly} {
 } {{} {}}
 
 test winMenu-19.1 {DrawMenuEntryIndicator - not checkbutton or radiobutton} \
-	{pcOnly} {
+	win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-19.2 {DrawMenuEntryIndicator - not selected} {pcOnly} {
+test winMenu-19.2 {DrawMenuEntryIndicator - not selected} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-19.3 {DrawMenuEntryIndicator - checkbutton} {pcOnly} {
+test winMenu-19.3 {DrawMenuEntryIndicator - checkbutton} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
@@ -505,7 +505,7 @@ test winMenu-19.3 {DrawMenuEntryIndicator - checkbutton} {pcOnly} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-19.4 {DrawMenuEntryIndicator - radiobutton} {pcOnly} {
+test winMenu-19.4 {DrawMenuEntryIndicator - radiobutton} win {
     catch {destroy .m1}
     menu .m1
     .m1 add radiobutton -label foo
@@ -513,7 +513,7 @@ test winMenu-19.4 {DrawMenuEntryIndicator - radiobutton} {pcOnly} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-19.5 {DrawMenuEntryIndicator - disabled} {pcOnly} {
+test winMenu-19.5 {DrawMenuEntryIndicator - disabled} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
@@ -522,7 +522,7 @@ test winMenu-19.5 {DrawMenuEntryIndicator - disabled} {pcOnly} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-19.6 {DrawMenuEntryIndicator - indicator not on} {pcOnly} {
+test winMenu-19.6 {DrawMenuEntryIndicator - indicator not on} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo -indicatoron 0
@@ -531,29 +531,28 @@ test winMenu-19.6 {DrawMenuEntryIndicator - indicator not on} {pcOnly} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test winMenu-20.1 {DrawMenuEntryAccelerator - disabled} {pcOnly} {
+test winMenu-20.1 {DrawMenuEntryAccelerator - disabled} win {
     catch {destroy .m1}
     menu .m1 -disabledforeground red
     .m1 add command -label foo -accel "Ctrl+U" -state disabled
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-20.2 {DrawMenuEntryAccelerator - normal text} {pcOnly} {
+test winMenu-20.2 {DrawMenuEntryAccelerator - normal text} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -accel "Ctrl+U"
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-20.3 {DrawMenuEntryAccelerator - disabled, no disabledforeground} \
-	{pcOnly} {
+test winMenu-20.3 {DrawMenuEntryAccelerator - disabled, no disabledforeground} win {
     catch {destroy .m1}
     menu .m1 -disabledforeground ""
     .m1 add command -label foo -accel "Ctrl+U" -state disabled
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-20.4 {DrawMenuEntryAccelerator - cascade, drawArrow true} {pcOnly} {
+test winMenu-20.4 {DrawMenuEntryAccelerator - cascade, drawArrow true} win {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label foo
@@ -561,14 +560,14 @@ test winMenu-20.4 {DrawMenuEntryAccelerator - cascade, drawArrow true} {pcOnly}
     list [update] [destroy .m1]
 } {{} {}}
 test winMenu-20.5 {DrawMenuEntryAccelerator - cascade, drawArrow false} \
-	{pcOnly userInteraction} {
+	{win userInteraction} {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label "winMenu-23.5: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
 
-test winMenu-21.1 {DrawMenuSeparator} {pcOnly} {
+test winMenu-21.1 {DrawMenuSeparator} win {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
@@ -576,7 +575,7 @@ test winMenu-21.1 {DrawMenuSeparator} {pcOnly} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test winMenu-22.1 {DrawMenuUnderline} {pcOnly} {
+test winMenu-22.1 {DrawMenuUnderline} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -underline 0
@@ -585,25 +584,25 @@ test winMenu-22.1 {DrawMenuUnderline} {pcOnly} {
 } {{} {}}   
 
 test winMenu-23.1 {Don't know how to test MenuKeyBindProc} \
-	{pcOnly emptyTest} {} {}
+	{win emptyTest} {} {}
 test winMenu-24.1 {TkpInitializeMenuBindings called at boot time} \
-	{pcOnly emptyTest} {} {}
+	{win emptyTest} {} {}
 
-test winMenu-25.1 {DrawMenuEntryLabel - normal} {pcOnly} {
+test winMenu-25.1 {DrawMenuEntryLabel - normal} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-25.2 {DrawMenuEntryLabel - disabled with fg} {pcOnly} {
+test winMenu-25.2 {DrawMenuEntryLabel - disabled with fg} win {
     catch {destroy .m1}
     menu .m1 -disabledforeground red
     .m1 add command -label foo -state disabled
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-25.3 {DrawMenuEntryLabel - disabled with no fg} {pcOnly} {
+test winMenu-25.3 {DrawMenuEntryLabel - disabled with no fg} win {
     catch {destroy .m1}
     menu .m1 -disabledforeground ""
     .m1 add command -label foo -state disabled
@@ -611,27 +610,27 @@ test winMenu-25.3 {DrawMenuEntryLabel - disabled with no fg} {pcOnly} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test winMenu-26.1 {TkpComputeMenubarGeometry} {pcOnly} {
+test winMenu-26.1 {TkpComputeMenubarGeometry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label File
     list [. configure -menu .m1] [. configure -menu ""] [destroy .m1]
 } {{} {} {}}
 
-test winMenu-27.1 {DrawTearoffEntry} {pcOnly userInteraction} {
+test winMenu-27.1 {DrawTearoffEntry} {win userInteraction} {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "winMenu-24.4: Hit ESCAPE."
     list [.m1 post 40 40] [destroy .m1]
 } {{} {}}
 
-test winMenu-28.1 {TkpConfigureMenuEntry - update pending} {pcOnly} {
+test winMenu-28.1 {TkpConfigureMenuEntry - update pending} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label Hello
     list [catch {.m1 add command -label Two} msg] $msg [destroy .m1]
 } {0 {} {}}
-test winMenu-28.2 {TkpConfigureMenuEntry - update not pending} {pcOnly} {
+test winMenu-28.2 {TkpConfigureMenuEntry - update not pending} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label One
@@ -639,8 +638,7 @@ test winMenu-28.2 {TkpConfigureMenuEntry - update not pending} {pcOnly} {
     list [catch {.m1 add command -label Two} msg] $msg [destroy .m1]
 } {0 {} {}}
 
-test winMenu-29.1 {TkpDrawMenuEntry - gc for active and not strict motif} \
-	{pcOnly} {
+test winMenu-29.1 {TkpDrawMenuEntry - gc for active and not strict motif} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -648,8 +646,7 @@ test winMenu-29.1 {TkpDrawMenuEntry - gc for active and not strict motif} \
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.2 {TkpDrawMenuEntry - gc for active menu item with its own gc} \
-	{pcOnly} {
+test winMenu-29.2 {TkpDrawMenuEntry - gc for active menu item with its own gc} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -activeforeground red
@@ -657,7 +654,7 @@ test winMenu-29.2 {TkpDrawMenuEntry - gc for active menu item with its own gc} \
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.3 {TkpDrawMenuEntry - gc for active and strict motif} {pcOnly} {
+test winMenu-29.3 {TkpDrawMenuEntry - gc for active and strict motif} win {
     catch {destroy .m1}
     menu .m1
     set tk_strictMotif 1
@@ -668,42 +665,42 @@ test winMenu-29.3 {TkpDrawMenuEntry - gc for active and strict motif} {pcOnly} {
 } {{} {} 0}
 test winMenu-29.4 \
 	{TkpDrawMenuEntry - gc for disabled with disabledfg and custom entry} \
-	{pcOnly} {
+	win {
     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 winMenu-29.5 {TkpDrawMenuEntry - gc for disabled with disabledFg} {pcOnly} {
+test winMenu-29.5 {TkpDrawMenuEntry - gc for disabled with disabledFg} win {
     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 winMenu-29.6 {TkpDrawMenuEntry - gc for disabled - no disabledFg} {pcOnly} {
+test winMenu-29.6 {TkpDrawMenuEntry - gc for disabled - no disabledFg} win {
     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 winMenu-29.7 {TkpDrawMenuEntry - gc for normal - custom entry} {pcOnly} {
+test winMenu-29.7 {TkpDrawMenuEntry - gc for normal - custom entry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -foreground red
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.8 {TkpDrawMenuEntry - gc for normal} {pcOnly} {
+test winMenu-29.8 {TkpDrawMenuEntry - gc for normal} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.9 {TkpDrawMenuEntry - gc for indicator - custom entry} {pcOnly} {
+test winMenu-29.9 {TkpDrawMenuEntry - gc for indicator - custom entry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo -selectcolor orange
@@ -711,7 +708,7 @@ test winMenu-29.9 {TkpDrawMenuEntry - gc for indicator - custom entry} {pcOnly}
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.10 {TkpDrawMenuEntry - gc for indicator} {pcOnly} {
+test winMenu-29.10 {TkpDrawMenuEntry - gc for indicator} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label foo
@@ -719,7 +716,7 @@ test winMenu-29.10 {TkpDrawMenuEntry - gc for indicator} {pcOnly} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.11 {TkpDrawMenuEntry - border - custom entry} {pcOnly} {
+test winMenu-29.11 {TkpDrawMenuEntry - border - custom entry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -activebackground green
@@ -727,7 +724,7 @@ test winMenu-29.11 {TkpDrawMenuEntry - border - custom entry} {pcOnly} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.12 {TkpDrawMenuEntry - border} {pcOnly} {
+test winMenu-29.12 {TkpDrawMenuEntry - border} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -735,7 +732,7 @@ test winMenu-29.12 {TkpDrawMenuEntry - border} {pcOnly} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.13 {TkpDrawMenuEntry - active border - strict motif} {pcOnly} {
+test winMenu-29.13 {TkpDrawMenuEntry - active border - strict motif} win {
     catch {destroy .m1}
     set tk_strictMotif 1
     menu .m1
@@ -744,7 +741,7 @@ test winMenu-29.13 {TkpDrawMenuEntry - active border - strict motif} {pcOnly} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1] [set tk_strictMotif 0]
 } {{} {} 0}
-test winMenu-29.14 {TkpDrawMenuEntry - active border - custom entry} {pcOnly} {
+test winMenu-29.14 {TkpDrawMenuEntry - active border - custom entry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo -activeforeground yellow
@@ -752,7 +749,7 @@ test winMenu-29.14 {TkpDrawMenuEntry - active border - custom entry} {pcOnly} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.15 {TkpDrawMenuEntry - active border} {pcOnly} {
+test winMenu-29.15 {TkpDrawMenuEntry - active border} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -760,35 +757,35 @@ test winMenu-29.15 {TkpDrawMenuEntry - active border} {pcOnly} {
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.16 {TkpDrawMenuEntry - font - custom entry} {pcOnly} {
+test winMenu-29.16 {TkpDrawMenuEntry - font - custom entry} win {
     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 winMenu-29.17 {TkpDrawMenuEntry - font} {pcOnly} {
+test winMenu-29.17 {TkpDrawMenuEntry - font} win {
     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 winMenu-29.18 {TkpDrawMenuEntry - separator} {pcOnly} {
+test winMenu-29.18 {TkpDrawMenuEntry - separator} win {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.19 {TkpDrawMenuEntry - standard} {pcOnly} {
+test winMenu-29.19 {TkpDrawMenuEntry - standard} win {
     catch {destroy .mb}
     menu .m1
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.20 {TkpDrawMenuEntry - disabled cascade item} {pcOnly} {
+test winMenu-29.20 {TkpDrawMenuEntry - disabled cascade item} win {
     catch {destroy .m1}
     menu .m1
     .m1 add cascade -label File -menu .m1.file
@@ -798,7 +795,7 @@ test winMenu-29.20 {TkpDrawMenuEntry - disabled cascade item} {pcOnly} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.21 {TkpDrawMenuEntry - indicator} {pcOnly} {
+test winMenu-29.21 {TkpDrawMenuEntry - indicator} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label winMenu-31.20
@@ -806,7 +803,7 @@ test winMenu-29.21 {TkpDrawMenuEntry - indicator} {pcOnly} {
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-29.22 {TkpDrawMenuEntry - indicator} {pcOnly} {
+test winMenu-29.22 {TkpDrawMenuEntry - indicator} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label winMenu-31.21 -hidemargin 1
@@ -815,7 +812,7 @@ test winMenu-29.22 {TkpDrawMenuEntry - indicator} {pcOnly} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test winMenu-30.1 {GetMenuLabelGeometry - image} {testImageType pcOnly} {
+test winMenu-30.1 {GetMenuLabelGeometry - image} {testImageType win} {
     catch {destroy .m1}
     catch {image delete image1}
     menu .m1
@@ -823,33 +820,33 @@ test winMenu-30.1 {GetMenuLabelGeometry - image} {testImageType pcOnly} {
     .m1 add command -image image1
     list [update idletasks] [destroy .m1] [image delete image1]
 } {{} {} {}}
-test winMenu-30.2 {GetMenuLabelGeometry - bitmap} {pcOnly} {
+test winMenu-30.2 {GetMenuLabelGeometry - bitmap} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -bitmap questhead
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-30.3 {GetMenuLabelGeometry - no text} {pcOnly} {
+test winMenu-30.3 {GetMenuLabelGeometry - no text} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-30.4 {GetMenuLabelGeometry - text} {pcOnly} {
+test winMenu-30.4 {GetMenuLabelGeometry - text} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "This is a test."
     list [update idletasks] [destroy .m1]
 } {{} {}}
 
-test winMenu-31.1 {DrawMenuEntryBackground} {pcOnly} {
+test winMenu-31.1 {DrawMenuEntryBackground} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } {{} {}}
-test winMenu-31.2 {DrawMenuEntryBackground} {pcOnly} {
+test winMenu-31.2 {DrawMenuEntryBackground} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label foo
@@ -858,31 +855,31 @@ test winMenu-31.2 {DrawMenuEntryBackground} {pcOnly} {
     list [update] [destroy .m1]
 } {{} {}}
 
-test winMenu-32.1 {TkpComputeStandardMenuGeometry - no entries} {pcOnly} {
+test winMenu-32.1 {TkpComputeStandardMenuGeometry - no entries} win {
     catch {destroy .m1}
     menu .m1
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.2 {TkpComputeStandardMenuGeometry - one entry} {pcOnly} {
+test winMenu-32.2 {TkpComputeStandardMenuGeometry - one entry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "one"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.3 {TkpComputeStandardMenuGeometry - more than one entry} {pcOnly} {
+test winMenu-32.3 {TkpComputeStandardMenuGeometry - more than one entry} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "one"
     .m1 add command -label "two"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.4 {TkpComputeStandardMenuGeometry - separator} {pcOnly} {
+test winMenu-32.4 {TkpComputeStandardMenuGeometry - separator} win {
     catch {destroy .m1}
     menu .m1
     .m1 add separator
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.5 {TkpComputeStandardMenuGeometry - tearoff entry} {unixOnly} {
+test winMenu-32.5 {TkpComputeStandardMenuGeometry - tearoff entry} unix {
     catch {destroy .m1}
     menubutton .mb -text "test" -menu .mb.m
     menu .mb.m
@@ -892,55 +889,54 @@ test winMenu-32.5 {TkpComputeStandardMenuGeometry - tearoff entry} {unixOnly} {
     list [update] [destroy .mb]
 } {{} {}}
 test winMenu-32.6 {TkpComputeStandardMenuGeometry - standard label geometry} \
-	{pcOnly} {
+	win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test"
     list [update idletasks] [destroy .m1]
 } {{} {}}
 test winMenu-32.7 {TkpComputeStandardMenuGeometry - different font for entry} \
-	{pcOnly} {
+	win {
     catch {destroy .m1}
     menu .m1 -font "Helvetica 12"
     .m1 add command -label "test" -font "Courier 12"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.8 {TkpComputeStandardMenuGeometry - second entry larger} \
-	{pcOnly} {
+test winMenu-32.8 {TkpComputeStandardMenuGeometry - second entry larger} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test"
     .m1 add command -label "test test"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.9 {TkpComputeStandardMenuGeometry - first entry larger} {pcOnly} {
+test winMenu-32.9 {TkpComputeStandardMenuGeometry - first entry larger} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test test"
     .m1 add command -label "test"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.10 {TkpComputeStandardMenuGeometry - accelerator} {pcOnly} {
+test winMenu-32.10 {TkpComputeStandardMenuGeometry - accelerator} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label "test" -accel "Ctrl+S"
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.11 {TkpComputeStandardMenuGeometry - second accel larger} {pcOnly} {
+test winMenu-32.11 {TkpComputeStandardMenuGeometry - second accel larger} win {
     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 winMenu-32.12 {TkpComputeStandardMenuGeometry - second accel smaller} {pcOnly} {
+test winMenu-32.12 {TkpComputeStandardMenuGeometry - second accel smaller} win {
     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 winMenu-32.13 {TkpComputeStandardMenuGeometry - indicator} {pcOnly} {
+test winMenu-32.13 {TkpComputeStandardMenuGeometry - indicator} win {
     catch {destroy .m1}
     menu .m1
     .m1 add checkbutton -label test
@@ -949,7 +945,7 @@ test winMenu-32.13 {TkpComputeStandardMenuGeometry - indicator} {pcOnly} {
 } {{} {}}
 test winMenu-32.14 \
 	{TkpComputeStandardMenuGeometry - second indicator less or equal} \
-	{testImageType pcOnly} {
+	{testImageType win} {
     catch {destroy .m1}
     catch {image delete image1}
     image create test image1
@@ -961,7 +957,7 @@ test winMenu-32.14 \
     list [update idletasks] [destroy .m1] [image delete image1]
 } {{} {} {}}
 test winMenu-32.15 {TkpComputeStandardMenuGeometry - second indicator larger} \
-	{testImageType unixOnly} {
+	{testImageType unix} {
     catch {destroy .m1}
     catch {image delete image1}
     image create test image1
@@ -972,14 +968,12 @@ test winMenu-32.15 {TkpComputeStandardMenuGeometry - second indicator larger} \
     .m1 invoke 2
     list [update idletasks] [destroy .m1] [image delete image1]
 } {{} {} {}}
-test winMenu-32.16 {TkpComputeStandardMenuGeometry - zero sized menus} \
-	{pcOnly} {
+test winMenu-32.16 {TkpComputeStandardMenuGeometry - zero sized menus} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.17 {TkpComputeStandardMenuGeometry - first column bigger} \
-	{pcOnly} {
+test winMenu-32.17 {TkpComputeStandardMenuGeometry - first column bigger} win {
     catch {destroy .m1}
     menu .m1
     .m1 add command -label one
@@ -988,7 +982,7 @@ test winMenu-32.17 {TkpComputeStandardMenuGeometry - first column bigger} \
     list [update idletasks] [destroy .m1]
 } {{} {}}
 test winMenu-32.18 {TkpComputeStandardMenuGeometry - second column bigger} \
-	{pcOnly} {
+	win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label one
@@ -996,7 +990,7 @@ test winMenu-32.18 {TkpComputeStandardMenuGeometry - second column bigger} \
     .m1 add command -label three
     list [update idletasks] [destroy .m1]
 } {{} {}}
-test winMenu-32.19 {TkpComputeStandardMenuGeometry - three columns} {pcOnly} {
+test winMenu-32.19 {TkpComputeStandardMenuGeometry - three columns} win {
     catch {destroy .m1}
     menu .m1 -tearoff 0
     .m1 add command -label one
@@ -1008,14 +1002,14 @@ test winMenu-32.19 {TkpComputeStandardMenuGeometry - three columns} {pcOnly} {
     list [update idletasks] [destroy .m1]    
 } {{} {}}
 
-test winMenu-33.1 {TkpNotifyTopLevelCreate - no menu yet} {pcOnly} {
+test winMenu-33.1 {TkpNotifyTopLevelCreate - no menu yet} win {
     catch {destroy .t2}
     catch {destroy .m1}
     toplevel .t2 -menu .m1
     wm geometry .t2 +0+0
     list [update idletasks] [destroy .t2]
 } {{} {}}
-test winMenu-33.2 {TkpNotifyTopLevelCreate - menu} {pcOnly} {
+test winMenu-33.2 {TkpNotifyTopLevelCreate - menu} win {
     catch {destroy .t2}
     catch {destroy .m1}
     menu .m1
@@ -1028,7 +1022,7 @@ test winMenu-33.2 {TkpNotifyTopLevelCreate - menu} {pcOnly} {
     list [update idletasks] [destroy .m1] [destroy .t2]
 } {{} {} {}}
 
-test winMenu-34.1 {TkpMenuInit called at boot time} {emptyTest pcOnly} {} {}
+test winMenu-34.1 {TkpMenuInit called at boot time} {emptyTest win} {} {}
 
 # cleanup
 deleteWindows