diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | library/demos/widget | 1 | ||||
| -rw-r--r-- | library/tk.tcl | 53 | ||||
| -rw-r--r-- | tests/all.tcl | 3 | ||||
| -rw-r--r-- | tests/constraints.tcl | 2 | ||||
| -rw-r--r-- | tests/ttk/all.tcl | 3 |
6 files changed, 36 insertions, 32 deletions
@@ -1,3 +1,9 @@ +2013-01-13 Jan Nijtmans <nijtmans@users.sf.net> + + * library/tk.tcl: [Bug 3600390]: tk_strictMotif not tested for. + * library/ttk/entry.tcl: Now all key-bindings for Control- + a,b,e,f,n,p (and its shift variant) respect tk_strictMotif. + 2013-01-10 Jan Nijtmans <nijtmans@users.sf.net> * library/text.tcl: [Bug 3600251]: Inappropriate replacement of Mac 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 bc8cace..5ed1724 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 @@ -309,16 +306,22 @@ proc ::tk::EventMotifBindings {n1 dummy dummy} { set op add } - event $op <<Cut>> <Control-Key-w> <Shift-Key-Delete> - event $op <<Copy>> <Meta-Key-w> <Control-Key-Insert> - event $op <<Paste>> <Control-Key-y> <Shift-Key-Insert> + event $op <<Cut>> <Control-Key-w> <Control-Lock-Key-W> <Shift-Key-Delete> + event $op <<Copy>> <Meta-Key-w> <Meta-Lock-Key-W> <Control-Key-Insert> + event $op <<Paste>> <Control-Key-y> <Control-Lock-Key-Y> <Shift-Key-Insert> event $op <<Undo>> <Control-underscore> - event $op <<PrevChar>> <Control-Key-b> - event $op <<NextChar>> <Control-Key-f> - event $op <<PrevLine>> <Control-Key-p> - event $op <<NextLine>> <Control-Key-n> - event $op <<LineStart>> <Control-Key-a> - event $op <<LineEnd>> <Control-Key-e> + event $op <<PrevChar>> <Control-Key-b> <Control-Lock-Key-B> + event $op <<NextChar>> <Control-Key-f> <Control-Lock-Key-F> + event $op <<PrevLine>> <Control-Key-p> <Control-Lock-Key-P> + event $op <<NextLine>> <Control-Key-n> <Control-Lock-Key-N> + event $op <<LineStart>> <Control-Key-a> <Control-Lock-Key-A> + event $op <<LineEnd>> <Control-Key-e> <Control-Lock-Key-E> + event $op <<SelectPrevChar>> <Control-Key-B> <Control-Lock-Key-b> + event $op <<SelectNextChar>> <Control-Key-F> <Control-Lock-Key-f> + event $op <<SelectPrevLine>> <Control-Key-P> <Control-Lock-Key-p> + event $op <<SelectNextLine>> <Control-Key-N> <Control-Lock-Key-n> + event $op <<SelectLineStart>> <Control-Key-A> <Control-Lock-Key-a> + event $op <<SelectLineEnd>> <Control-Key-E> <Control-Lock-Key-e> } #---------------------------------------------------------------------- @@ -379,22 +382,22 @@ switch -exact -- [tk windowingsystem] { event add <<SelectAll>> <Control-Key-slash> event add <<SelectNone>> <Control-Key-backslash> - event add <<NextChar>> <Right> <Control-Key-f> <Control-Lock-Key-F> - event add <<SelectNextChar>> <Shift-Right> <Control-Key-F> <Control-Lock-Key-f> - event add <<PrevChar>> <Left> <Control-Key-b> <Control-Lock-Key-B> - event add <<SelectPrevChar>> <Shift-Left> <Control-Key-B> <Control-Lock-Key-b> + event add <<NextChar>> <Right> + event add <<SelectNextChar>> <Shift-Right> + event add <<PrevChar>> <Left> + event add <<SelectPrevChar>> <Shift-Left> event add <<NextWord>> <Control-Right> event add <<SelectNextWord>> <Control-Shift-Right> event add <<PrevWord>> <Control-Left> event add <<SelectPrevWord>> <Control-Shift-Left> - event add <<LineStart>> <Home> <Control-Key-a> <Control-Lock-Key-A> - event add <<SelectLineStart>> <Shift-Home> <Control-Key-A> <Control-Lock-Key-a> - event add <<LineEnd>> <End> <Control-Key-e> <Control-Lock-Key-E> - event add <<SelectLineEnd>> <Shift-End> <Control-Key-E> <Control-Lock-Key-e> - event add <<PrevLine>> <Up> <Control-Key-p> <Control-Lock-Key-P> - event add <<NextLine>> <Down> <Control-Key-n> <Control-Lock-Key-N> - event add <<SelectPrevLine>> <Shift-Up> <Control-Key-P> <Control-Lock-Key-p> - event add <<SelectNextLine>> <Shift-Down> <Control-Key-N> <Control-Lock-Key-n> + event add <<LineStart>> <Home> + event add <<SelectLineStart>> <Shift-Home> + event add <<LineEnd>> <End> + event add <<SelectLineEnd>> <Shift-End> + event add <<PrevLine>> <Up> + event add <<NextLine>> <Down> + event add <<SelectPrevLine>> <Shift-Up> + event add <<SelectNextLine>> <Shift-Down> event add <<PrevPara>> <Control-Up> event add <<NextPara>> <Control-Down> event add <<SelectPrevPara>> <Control-Shift-Up> 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 \ |