diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-12 23:17:18 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2013-01-12 23:17:18 (GMT) |
| commit | fb936420494d686c56f39d882b36b318f0ba8fd5 (patch) | |
| tree | ebbb94a3edfe6d211562a4c85bec867b76a28e70 | |
| parent | fa87897c16b0dc6d903c1be0dc80389d9cd072e3 (diff) | |
| download | tk-fb936420494d686c56f39d882b36b318f0ba8fd5.zip tk-fb936420494d686c56f39d882b36b318f0ba8fd5.tar.gz tk-fb936420494d686c56f39d882b36b318f0ba8fd5.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 boths
| -rw-r--r-- | library/demos/widget | 1 | ||||
| -rw-r--r-- | library/tk.tcl | 6 | ||||
| -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, 12 deletions
diff --git a/library/demos/widget b/library/demos/widget index d58f086..162497e 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 package require Ttk diff --git a/library/tk.tcl b/library/tk.tcl index 8d6f0f9..b69648f 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -10,12 +10,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 ;# Guard against [source] in an 8.4- interp before - ;# using 8.5 [package] features. -# Insist on running with compatible version of Tcl -package require Tcl 8.5.0 # Verify that we have Tk binary and script components from the same release -package require -exact Tk 8.5.13 +package require -exact Tk 8.5.13 # Create a ::tk namespace namespace eval ::tk { 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 bc2c09b..01089aa 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 \ |