summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--tests/focus.test4
-rw-r--r--tests/macEmbed.test4
-rw-r--r--tests/macMenu.test4
-rw-r--r--tests/menu.test4
-rw-r--r--tests/unixEmbed.test4
-rw-r--r--tests/unixWm.test4
7 files changed, 22 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index f7428e7..723f83e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-03-28 Don Porter <dgp@users.sourceforge.net>
+
+ * tests/focus.test (focus-6.1):
+ * tests/macEmbed.testi (unixEmbed-5.1):
+ * tests/macMenu.test (macMenu-21.3):
+ * tests/menu.testi (menu-27.1):
+ * tests/unixEmbed.test (unixEmbed-8.2):
+ * tests/unixWm.testi (unixWm-50.4): Replaced all [load {} tk]
+ in Tk test suite with [load {} Tk]. [Bug 220940, Patch 411952]
+
2001-02-13 Eric Melski <ericm@interwoven.com>
* doc/photo.n: [Bug 132213] Added clarification on interpretation
diff --git a/tests/focus.test b/tests/focus.test
index 5750ae8..2e95945 100644
--- a/tests/focus.test
+++ b/tests/focus.test
@@ -6,7 +6,7 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: focus.test,v 1.6 2000/05/11 22:36:32 hobbs Exp $
+# RCS: @(#) $Id: focus.test,v 1.7 2001/03/28 17:27:10 dgp Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -572,7 +572,7 @@ test focus-6.1 {miscellaneous - embedded application in same process} \
bind all <FocusOut> {lappend x "focus out %W %d"}
interp create child
child eval "set argv {-use [winfo id .t.f1]}"
- load {} tk child
+ load {} Tk child
child eval {
entry .e1 -bg lightBlue
pack .e1
diff --git a/tests/macEmbed.test b/tests/macEmbed.test
index 67a77a0..b6c2f68 100644
--- a/tests/macEmbed.test
+++ b/tests/macEmbed.test
@@ -6,7 +6,7 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: macEmbed.test,v 1.4 1999/04/16 01:51:38 stanton Exp $
+# RCS: @(#) $Id: macEmbed.test,v 1.5 2001/03/28 17:27:10 dgp Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -216,7 +216,7 @@ test unixEmbed-5.1 {TkpClaimFocus procedure} {macOnly tempNotMac} {
pack .f1 .f2
interp create child
child eval "set argv {-use [winfo id .f1]}"
- load {} tk child
+ load {} Tk child
child eval {
. configure -bd 2 -highlightthickness 2 -relief sunken
}
diff --git a/tests/macMenu.test b/tests/macMenu.test
index b76b7e6..808e46d 100644
--- a/tests/macMenu.test
+++ b/tests/macMenu.test
@@ -7,7 +7,7 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: macMenu.test,v 1.3 1999/04/16 01:51:39 stanton Exp $
+# RCS: @(#) $Id: macMenu.test,v 1.4 2001/03/28 17:27:10 dgp Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -852,7 +852,7 @@ test macMenu-21.3 {TkpSetMainMenubar - different interps} {
catch {destroy .m1}
catch {interp delete testinterp}
interp create testinterp
- load {} tk testinterp
+ load {} Tk testinterp
menu .m1
. configure -menu .m1
raise .
diff --git a/tests/menu.test b/tests/menu.test
index fa3a049..db13f8f 100644
--- a/tests/menu.test
+++ b/tests/menu.test
@@ -5,7 +5,7 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: menu.test,v 1.5 2000/09/30 18:46:04 drh Exp $
+# RCS: @(#) $Id: menu.test,v 1.6 2001/03/28 17:27:10 dgp Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -2300,7 +2300,7 @@ test menu-26.1 {DestroyMenuHashTable} {
test menu-27.1 {GetMenuHashTable} {
catch {interp destroy testinterp}
interp create testinterp
- load {} tk testinterp
+ load {} Tk testinterp
list [catch {interp eval testinterp {menu .m1}} msg] $msg [interp delete testinterp]
} {0 .m1 {}}
diff --git a/tests/unixEmbed.test b/tests/unixEmbed.test
index 41e304b..cbc7d96 100644
--- a/tests/unixEmbed.test
+++ b/tests/unixEmbed.test
@@ -6,7 +6,7 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: unixEmbed.test,v 1.7 1999/04/21 21:53:30 rjohnson Exp $
+# RCS: @(#) $Id: unixEmbed.test,v 1.8 2001/03/28 17:27:10 dgp Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -550,7 +550,7 @@ test unixEmbed-8.2 {TkpClaimFocus procedure} {
pack .f1 .f2
interp create child
child eval "set argv {-use [winfo id .f1]}"
- load {} tk child
+ load {} Tk child
child eval {
. configure -bd 2 -highlightthickness 2 -relief sunken
}
diff --git a/tests/unixWm.test b/tests/unixWm.test
index 61c8a5a..78b9bd7 100644
--- a/tests/unixWm.test
+++ b/tests/unixWm.test
@@ -7,7 +7,7 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: unixWm.test,v 1.12 2000/03/29 00:09:07 ericm Exp $
+# RCS: @(#) $Id: unixWm.test,v 1.13 2001/03/28 17:27:10 dgp Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
source [file join [pwd] [file dirname [info script]] defs.tcl]
@@ -1832,7 +1832,7 @@ test unixWm-50.4 {Tk_CoordsToWindow procedure, window in other application} {
wm geometry .t +0+0
tkwait visibility .t
interp create slave
- load {} tk slave
+ load {} Tk slave
slave eval {wm geometry . 200x200+0+0; tkwait visibility .}
set result [list [winfo containing 100 100] \
[slave eval {winfo containing 100 100}]]