merge trunk

3 files changed, 29 insertions, 21 deletions

diff --git a/library/listbox.tcl b/library/listbox.tcl
index 31d0fbb..01fb03d 100644
--- a/library/listbox.tcl
+++ b/library/listbox.tcl
@@ -120,7 +120,7 @@ bind Listbox <Control-Home> {
     %W selection set 0
     event generate %W <<ListboxSelect>>
 }
-bind Listbox <Shift-Control-Home> {
+bind Listbox <Control-Shift-Home> {
     tk::ListboxDataExtend %W 0
 }
 bind Listbox <Control-End> {
@@ -130,7 +130,7 @@ bind Listbox <Control-End> {
     %W selection set end
     event generate %W <<ListboxSelect>>
 }
-bind Listbox <Shift-Control-End> {
+bind Listbox <Control-Shift-End> {
     tk::ListboxDataExtend %W [%W index end]
 }
 bind Listbox <<Copy>> {
diff --git a/library/tk.tcl b/library/tk.tcl
index 8a0e3ff..fb16418 100644
--- a/library/tk.tcl
+++ b/library/tk.tcl
@@ -307,14 +307,22 @@ proc ::tk::EventMotifBindings {n1 dummy dummy} {
 	set op add
     }
 
-    event $op <<Cut>> <Control-Key-w>
-    event $op <<Copy>> <Meta-Key-w> 
-    event $op <<Paste>> <Control-Key-y>
+    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 <<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 <<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>
 }
 
 #----------------------------------------------------------------------
@@ -380,12 +388,12 @@ switch -exact -- [tk windowingsystem] {
 	event add <<PrevChar>>		<Left>
 	event add <<SelectPrevChar>>	<Shift-Left>
 	event add <<NextWord>>		<Control-Right>
-	event add <<SelectNextWord>>	<Shift-Control-Right>
+	event add <<SelectNextWord>>	<Control-Shift-Right>
 	event add <<PrevWord>>		<Control-Left>
-	event add <<SelectPrevWord>>	<Shift-Control-Left>
-	event add <<LineStart>>		<Home> <Control-Key-a> <Control-Lock-Key-A>
+	event add <<SelectPrevWord>>	<Control-Shift-Left>
+	event add <<LineStart>>		<Home>
 	event add <<SelectLineStart>>	<Shift-Home>
-	event add <<LineEnd>>		<End> <Control-Key-e> <Control-Lock-Key-E>
+	event add <<LineEnd>>		<End>
 	event add <<SelectLineEnd>>	<Shift-End>
 	event add <<PrevLine>>		<Up>
 	event add <<NextLine>>		<Down>
@@ -393,8 +401,8 @@ switch -exact -- [tk windowingsystem] {
 	event add <<SelectNextLine>>	<Shift-Down>
 	event add <<PrevPara>>		<Control-Up>
 	event add <<NextPara>>		<Control-Down>
-	event add <<SelectPrevPara>>	<Shift-Control-Up>
-	event add <<SelectPrevPara>>	<Shift-Control-Down>
+	event add <<SelectPrevPara>>	<Control-Shift-Up>
+	event add <<SelectPrevPara>>	<Control-Shift-Down>
 
 	# Some OS's define a goofy (as in, not <Shift-Tab>) keysym that is
 	# returned when the user presses <Shift-Tab>. In order for tab
@@ -428,9 +436,9 @@ switch -exact -- [tk windowingsystem] {
 	event add <<PrevChar>>		<Left>
 	event add <<SelectPrevChar>>	<Shift-Left>
 	event add <<NextWord>>		<Control-Right>
-	event add <<SelectNextWord>>	<Shift-Control-Right>
+	event add <<SelectNextWord>>	<Control-Shift-Right>
 	event add <<PrevWord>>		<Control-Left>
-	event add <<SelectPrevWord>>	<Shift-Control-Left>
+	event add <<SelectPrevWord>>	<Control-Shift-Left>
 	event add <<LineStart>>		<Home> <Control-Key-a> <Control-Lock-Key-A>
 	event add <<SelectLineStart>>	<Shift-Home>
 	event add <<LineEnd>>		<End> <Control-Key-e> <Control-Lock-Key-E>
@@ -441,8 +449,8 @@ switch -exact -- [tk windowingsystem] {
 	event add <<SelectNextLine>>	<Shift-Down>
 	event add <<PrevPara>>		<Control-Up>
 	event add <<NextPara>>		<Control-Down>
-	event add <<SelectPrevPara>>	<Shift-Control-Up>
-	event add <<SelectPrevPara>>	<Shift-Control-Down>
+	event add <<SelectPrevPara>>	<Control-Shift-Up>
+	event add <<SelectPrevPara>>	<Control-Shift-Down>
     }
     "aqua" {
 	event add <<Cut>>		<Command-Key-x> <Key-F2> <Control-Lock-Key-X>
diff --git a/library/ttk/notebook.tcl b/library/ttk/notebook.tcl
index d424b6c..72b85e6 100644
--- a/library/ttk/notebook.tcl
+++ b/library/ttk/notebook.tcl
@@ -108,7 +108,7 @@ proc ttk::notebook::enableTraversal {nb} {
 	bind $top <Control-Key-Next>         {+ttk::notebook::TLCycleTab %W  1}
 	bind $top <Control-Key-Prior>        {+ttk::notebook::TLCycleTab %W -1}
 	bind $top <Control-Key-Tab> 	     {+ttk::notebook::TLCycleTab %W  1}
-	bind $top <Shift-Control-Key-Tab>    {+ttk::notebook::TLCycleTab %W -1}
+	bind $top <Control-Shift-Key-Tab>    {+ttk::notebook::TLCycleTab %W -1}
 	catch {
 	bind $top <Control-Key-ISO_Left_Tab> {+ttk::notebook::TLCycleTab %W -1}
 	}
@@ -170,7 +170,7 @@ proc ttk::notebook::EnclosingNotebook {w} {
 }
 
 # TLCycleTab --
-#	toplevel binding procedure for Control-Tab / Shift-Control-Tab
+#	toplevel binding procedure for Control-Tab / Control-Shift-Tab
 #	Select the next/previous tab in the nearest ancestor notebook. 
 #
 proc ttk::notebook::TLCycleTab {w dir} {