From de64eb806aa2c07e2a6661c850b23e39fe1701ff Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 11 Jan 2013 15:02:34 +0000 Subject: See bug 3600390 --- library/tk.tcl | 6 ++++++ library/ttk/entry.tcl | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/library/tk.tcl b/library/tk.tcl index b421d0b..bc8cace 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -313,6 +313,12 @@ proc ::tk::EventMotifBindings {n1 dummy dummy} { event $op <> event $op <> event $op <> + event $op <> + event $op <> + event $op <> + event $op <> + event $op <> + event $op <> } #---------------------------------------------------------------------- diff --git a/library/ttk/entry.tcl b/library/ttk/entry.tcl index f5ba19e..7d9c9ef 100644 --- a/library/ttk/entry.tcl +++ b/library/ttk/entry.tcl @@ -141,9 +141,6 @@ bind TEntry <> {# nothing} ## Additional emacs-like bindings: # -bind TEntry { ttk::entry::Move %W prevchar } -bind TEntry { ttk::entry::Delete %W } -bind TEntry { ttk::entry::Move %W nextchar } bind TEntry { ttk::entry::Backspace %W } bind TEntry { %W delete insert end } -- cgit v0.12 From fb936420494d686c56f39d882b36b318f0ba8fd5 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sat, 12 Jan 2013 23:17:18 +0000 Subject: "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 --- library/demos/widget | 1 - library/tk.tcl | 6 +----- tests/all.tcl | 3 +-- tests/constraints.tcl | 2 -- 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 \ -- cgit v0.12 From 4128d02196b15ba2e54c918a38a55c2c09449bb7 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 13 Jan 2013 18:19:33 +0000 Subject: removed one entry too much from ttk:entry --- library/ttk/entry.tcl | 1 + 1 file changed, 1 insertion(+) diff --git a/library/ttk/entry.tcl b/library/ttk/entry.tcl index 7d9c9ef..be2299f 100644 --- a/library/ttk/entry.tcl +++ b/library/ttk/entry.tcl @@ -141,6 +141,7 @@ bind TEntry <> {# nothing} ## Additional emacs-like bindings: # +bind TEntry { ttk::entry::Delete %W } bind TEntry { ttk::entry::Backspace %W } bind TEntry { %W delete insert end } -- cgit v0.12