diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-12 23:22:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-12 23:22:23 (GMT) |
| commit | 5676280816e3d3355ce864626bb7a328138648d8 (patch) | |
| tree | b3dec8b38b5e65f898ceadaa232b055063f12d10 | |
| parent | cfce00e636e389f48c32d61c5483a913a0a9d656 (diff) | |
| parent | fb936420494d686c56f39d882b36b318f0ba8fd5 (diff) | |
| download | tk-5676280816e3d3355ce864626bb7a328138648d8.zip tk-5676280816e3d3355ce864626bb7a328138648d8.tar.gz tk-5676280816e3d3355ce864626bb7a328138648d8.tar.bz2 | |
"package require Tk 8.5" already implies "package require Tcl 8.5" (That's what the Tcl_InitStubs does), so there is no need to test both.
| -rw-r--r-- | library/demos/widget | 1 | ||||
| -rw-r--r-- | library/tk.tcl | 5 | ||||
| -rw-r--r-- | tests/all.tcl | 3 | ||||
| -rw-r--r-- | tests/constraints.tcl | 2 | ||||
| -rw-r--r-- | tests/ttk/all.tcl | 3 |
5 files changed, 3 insertions, 11 deletions
diff --git a/library/demos/widget b/library/demos/widget index 8b92f9a..08aada1 100644 --- a/library/demos/widget +++ b/library/demos/widget @@ -10,7 +10,6 @@ exec wish "$0" ${1+"$@"} # separate ".tcl" files is this directory, which are sourced by this script as # needed. -package require Tcl 8.5 package require Tk 8.5 package require msgcat diff --git a/library/tk.tcl b/library/tk.tcl index b421d0b..ec4571d 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -10,11 +10,8 @@ # See the file "license.terms" for information on usage and redistribution of # this file, and for a DISCLAIMER OF ALL WARRANTIES. -# Insist on running with compatible version of Tcl -package require Tcl 8.6 # Verify that we have Tk binary and script components from the same release -package require -exact Tk 8.6.0 - +package require -exact Tk 8.6.0 # Create a ::tk namespace namespace eval ::tk { # Set up the msgcat commands diff --git a/tests/all.tcl b/tests/all.tcl index 7f57dc2..884877b 100644 --- a/tests/all.tcl +++ b/tests/all.tcl @@ -9,9 +9,8 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -package require Tcl 8.5 +package require Tk 8.5;# This is the Tk test suite; fail early if no Tk! package require tcltest 2.2 -package require Tk ;# This is the Tk test suite; fail early if no Tk! tcltest::configure {*}$argv tcltest::configure -testdir [file normalize [file dirname [info script]]] tcltest::configure -loadfile \ diff --git a/tests/constraints.tcl b/tests/constraints.tcl index e28b159..b694973 100644 --- a/tests/constraints.tcl +++ b/tests/constraints.tcl @@ -5,8 +5,6 @@ if {[namespace exists tk::test]} { return } -package require Tcl 8.4 - package require Tk 8.4 tk appname tktest wm title . tktest diff --git a/tests/ttk/all.tcl b/tests/ttk/all.tcl index da2e316..19f6e4e 100644 --- a/tests/ttk/all.tcl +++ b/tests/ttk/all.tcl @@ -9,9 +9,8 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. -package require Tcl 8.5 +package require Tk 8.5;# This is the Tk test suite; fail early if no Tk! package require tcltest 2.2 -package require Tk ;# This is the Tk test suite; fail early if no Tk! tcltest::configure {*}$argv tcltest::configure -testdir [file normalize [file dirname [info script]]] tcltest::configure -loadfile \ |