No deprecated function names in testcases

4 files changed, 32 insertions, 32 deletions

diff --git a/tests/embed.test b/tests/embed.test
index 92b8be9..8a61baf 100644
--- a/tests/embed.test
+++ b/tests/embed.test
@@ -10,7 +10,7 @@ eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
 
-test embed-1.1 {TkpUseWindow procedure, bad window identifier} -setup {
+test embed-1.1 {Tk_UseWindow procedure, bad window identifier} -setup {
     deleteWindows
 } -body {
     toplevel .t -use xyz
@@ -36,7 +36,7 @@ test embed-1.3 {CreateFrame procedure, both -use and -container is invalid} -set
 } -returnCodes error -result {windows cannot have both the -use and the -container option set}
 
 # testing window embedding for win platforms
-test embed-1.4.win {TkpUseWindow procedure, -container must be set} -constraints {
+test embed-1.4.win {Tk_UseWindow procedure, -container must be set} -constraints {
 	win
 } -setup {
     deleteWindows
@@ -47,7 +47,7 @@ test embed-1.4.win {TkpUseWindow procedure, -container must be set} -constraints
     deleteWindows
 } -returnCodes error -result {the window to use is not a Tk container}
 # testing window embedding for win platforms
-test embed-1.5.win {TkpUseWindow procedure, -container must be set} -constraints {
+test embed-1.5.win {Tk_UseWindow procedure, -container must be set} -constraints {
 	win
 } -setup {
     deleteWindows
@@ -59,7 +59,7 @@ test embed-1.5.win {TkpUseWindow procedure, -container must be set} -constraints
 } -returnCodes error -result {the window to use is not a Tk container}
 
 # testing window embedding for other than win platforms
-test embed-1.4.nonwin {TkpUseWindow procedure, -container must be set} -constraints {
+test embed-1.4.nonwin {Tk_UseWindow procedure, -container must be set} -constraints {
 	nonwin
 } -setup {
     deleteWindows
@@ -70,7 +70,7 @@ test embed-1.4.nonwin {TkpUseWindow procedure, -container must be set} -constrai
     deleteWindows
 } -returnCodes error -result {window ".container" doesn't have -container option set}
 # testing window embedding for other than win platforms
-test embed-1.5.nonwin {TkpUseWindow procedure, -container must be set} -constraints {
+test embed-1.5.nonwin {Tk_UseWindow procedure, -container must be set} -constraints {
 	nonwin
 } -setup {
     deleteWindows
diff --git a/tests/menu.test b/tests/menu.test
index c3fa4e3..054ac68 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -3613,7 +3613,7 @@ test menu-24.3 {TkNewMenuName} -setup {
 } -result {0 {} {} {} {}}
 
 
-test menu-25.1 {TkSetWindowMenuBar} -setup {
+test menu-25.1 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3621,7 +3621,7 @@ test menu-25.1 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.2 {TkSetWindowMenuBar} -setup {
+test menu-25.2 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3629,7 +3629,7 @@ test menu-25.2 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.3 {TkSetWindowMenuBar} -setup {
+test menu-25.3 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3639,7 +3639,7 @@ test menu-25.3 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.4 {TkSetWindowMenuBar} -setup {
+test menu-25.4 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3650,7 +3650,7 @@ test menu-25.4 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.5 {TkSetWindowMenuBar} -setup {
+test menu-25.5 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3662,7 +3662,7 @@ test menu-25.5 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.6 {TkSetWindowMenuBar} -setup {
+test menu-25.6 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3674,7 +3674,7 @@ test menu-25.6 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.7 {TkSetWindowMenuBar} -setup {
+test menu-25.7 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3687,7 +3687,7 @@ test menu-25.7 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.8 {TkSetWindowMenuBar} -setup {
+test menu-25.8 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3701,7 +3701,7 @@ test menu-25.8 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.9 {TkSetWindowMenuBar} -setup {
+test menu-25.9 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3716,7 +3716,7 @@ test menu-25.9 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.10 {TkSetWindowMenuBar} -setup {
+test menu-25.10 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3731,7 +3731,7 @@ test menu-25.10 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.11 {TkSetWindowMenuBar} -setup {
+test menu-25.11 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3746,7 +3746,7 @@ test menu-25.11 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.12 {TkSetWindowMenuBar} -setup {
+test menu-25.12 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3755,7 +3755,7 @@ test menu-25.12 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.13 {TkSetWindowMenuBar} -setup {
+test menu-25.13 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3763,7 +3763,7 @@ test menu-25.13 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.14 {TkSetWindowMenuBar} -setup {
+test menu-25.14 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3772,7 +3772,7 @@ test menu-25.14 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.15 {TkSetWindowMenuBar} -setup {
+test menu-25.15 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
@@ -3780,7 +3780,7 @@ test menu-25.15 {TkSetWindowMenuBar} -setup {
 } -cleanup {
     deleteWindows
 } -result {{} {}}
-test menu-25.16 {TkSetWindowMenuBar} -setup {
+test menu-25.16 {Tk_SetWindowMenubar} -setup {
     deleteWindows
 } -body {
     . configure -menu ""
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 2edd1d2..066c30d 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -90,21 +90,21 @@ proc colorsFree {w {red 31} {green 245} {blue 192}} {
 
 testConstraint pressbutton [llength [info commands pressbutton]]
 
-test unixEmbed-1.1 {TkpUseWindow procedure, bad window identifier} -constraints {
+test unixEmbed-1.1 {Tk_UseWindow procedure, bad window identifier} -constraints {
     unix
 } -setup {
     deleteWindows
 } -body {
     toplevel .t -use xyz
 } -returnCodes error -result {expected integer but got "xyz"}
-test unixEmbed-1.2 {TkpUseWindow procedure, bad window identifier} -constraints {
+test unixEmbed-1.2 {Tk_UseWindow procedure, bad window identifier} -constraints {
     unix
 } -setup {
     deleteWindows
 } -body {
     toplevel .t -use 47
 } -returnCodes error -result {couldn't create child of window "47"}
-test unixEmbed-1.3 {TkpUseWindow procedure, inheriting colormap} -constraints {
+test unixEmbed-1.3 {Tk_UseWindow procedure, inheriting colormap} -constraints {
     unix nonPortable
 } -setup {
     deleteWindows
@@ -118,7 +118,7 @@ test unixEmbed-1.3 {TkpUseWindow procedure, inheriting colormap} -constraints {
 } -cleanup {
     deleteWindows
 } -result 0
-test unixEmbed-1.4 {TkpUseWindow procedure, inheriting colormap} -constraints {
+test unixEmbed-1.4 {Tk_UseWindow procedure, inheriting colormap} -constraints {
     unix nonPortable
 } -setup {
     deleteWindows
@@ -132,7 +132,7 @@ test unixEmbed-1.4 {TkpUseWindow procedure, inheriting colormap} -constraints {
     deleteWindows
 } -result 1
 
-test unixEmbed-1.5 {TkpUseWindow procedure, creating Container records} -constraints {
+test unixEmbed-1.5 {Tk_UseWindow procedure, creating Container records} -constraints {
     unix testembed notAqua
 } -setup {
     deleteWindows
@@ -149,7 +149,7 @@ test unixEmbed-1.5 {TkpUseWindow procedure, creating Container records} -constra
 } -cleanup {
     deleteWindows
 } -result {{{XXX {} {} .t}} 0}
-test unixEmbed-1.5a {TkpUseWindow procedure, creating Container records} -constraints {
+test unixEmbed-1.5a {Tk_UseWindow procedure, creating Container records} -constraints {
     unix testembed
 } -setup {
     deleteWindows
@@ -170,7 +170,7 @@ test unixEmbed-1.5a {TkpUseWindow procedure, creating Container records} -constr
     interp delete child
     deleteWindows
 } -result {{{XXX {} {} .t}} 0}
-test unixEmbed-1.6 {TkpUseWindow procedure, creating Container records} -constraints {
+test unixEmbed-1.6 {Tk_UseWindow procedure, creating Container records} -constraints {
     unix testembed notAqua
 } -setup {
     deleteWindows
@@ -189,7 +189,7 @@ test unixEmbed-1.6 {TkpUseWindow procedure, creating Container records} -constra
 } -cleanup {
     deleteWindows
 } -result {{XXX {} {} .t2} {XXX {} {} .t1}}
-test unixEmbed-1.6a {TkpUseWindow procedure, creating Container records} -constraints {
+test unixEmbed-1.6a {Tk_UseWindow procedure, creating Container records} -constraints {
     unix testembed
 } -setup {
     deleteWindows
@@ -212,7 +212,7 @@ test unixEmbed-1.6a {TkpUseWindow procedure, creating Container records} -constr
     interp delete child
     deleteWindows
 } -result {{XXX {} {} .t2} {XXX {} {} .t1}}
-test unixEmbed-1.7 {TkpUseWindow procedure, container and embedded in same app} -constraints {
+test unixEmbed-1.7 {Tk_UseWindow procedure, container and embedded in same app} -constraints {
     unix testembed
 } -setup {
     deleteWindows
@@ -963,7 +963,7 @@ test unixEmbed-6.2a {EmbedGeometryRequest procedure, window changes size} -const
     deleteWindows
 } -result {{configure .t1 200 200} 200x200+0+0}
 
-# Can't think up any tests for TkpGetOtherWindow procedure.
+# Can't think up any tests for Tk_GetOtherWindow procedure.
 
 test unixEmbed-7.1 {TkpRedirectKeyEvent procedure, forward keystroke} -constraints {
     unix notAqua
diff --git a/tests/winMenu.test b/tests/winMenu.test
index 21768ef..2382d13 100644
--- a/tests/winMenu.test
+++ b/tests/winMenu.test
@@ -562,7 +562,7 @@ test winMenu-12.3 {TkpSetWindowMenuBar - no update pending} -constraints {
 } -result {0 {} {} {}}
 
 
-test winMenu-13.1 {TkpSetMainMenubar - nothing to do} -constraints {
+test winMenu-13.1 {Tk_SetMainMenubar - nothing to do} -constraints {
     emptyTest win
 } -body {}