From 2fdf253ee5c0cba07f91cccd30e01ee3f483d93c Mon Sep 17 00:00:00 2001
From: jenglish <jenglish@flightlab.com>
Date: Mon, 6 Oct 2003 22:14:26 +0000
Subject: * library/text.tcl, doc/text.n:  Text widget binding for Control-v is
 now Mac-only, since it conflicts with standard <<Paste>> binding on other
 platforms.  [Bug #605277]

---
 ChangeLog        |  5 +++++
 doc/text.n       |  7 +++----
 library/text.tcl | 13 ++++---------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ffc1021..efedbba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 2003-10-06  Joe English  <jenglish@users.sourceforge.net>
+	* library/text.tcl, doc/text.n:  Text widget binding for 
+	Control-v is now Mac-only, since it conflicts with standard 
+	<<Paste>> binding on other platforms.  [Bug #605277]
+
+2003-10-06  Joe English  <jenglish@users.sourceforge.net>
 	* generic/tkStyle.c: Fix double-free in style engine [Bug #798211]
 
 2003-10-06  Jeff Hobbs  <jeffh@ActiveState.com>
diff --git a/doc/text.n b/doc/text.n
index 77f5b03..16f186d 100644
--- a/doc/text.n
+++ b/doc/text.n
@@ -5,7 +5,7 @@
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 '\" 
-'\" RCS: @(#) $Id: text.n,v 1.17 2003/05/29 21:57:56 jenglish Exp $
+'\" RCS: @(#) $Id: text.n,v 1.18 2003/10/06 22:14:26 jenglish Exp $
 '\" 
 .so man.macros
 .TH text n 8.4 Tk "Tk Built-In Commands"
@@ -1658,8 +1658,6 @@ The Next and Prior keys move the insertion cursor forward or backwards
 by one screenful and clear any selection in the text.
 If the Shift key is held down while Next or Prior is typed, then
 the selection is extended to include the new character.
-Control-v moves the view down one screenful without moving the
-insertion cursor or adjusting the selection.
 .IP [12]
 Control-Next and Control-Prior scroll the view right or left by one page
 without moving the insertion cursor or affecting the selection.
@@ -1738,7 +1736,8 @@ front of the insertion cursor without moving the insertion cursor.
 Meta-backspace and Meta-Delete delete the word to the left of the
 insertion cursor.
 .IP [30]
-Control-x deletes whatever is selected in the text widget.
+Control-x deletes whatever is selected in the text widget
+after copying it to the clipboard.
 .IP [31]
 Control-t reverses the order of the two characters to the right of
 the insertion cursor. 
diff --git a/library/text.tcl b/library/text.tcl
index 864709a..7a3a699 100644
--- a/library/text.tcl
+++ b/library/text.tcl
@@ -3,7 +3,7 @@
 # This file defines the default bindings for Tk text widgets and provides
 # procedures that help in implementing the bindings.
 #
-# RCS: @(#) $Id: text.tcl,v 1.25 2003/05/19 13:04:24 vincentdarley Exp $
+# RCS: @(#) $Id: text.tcl,v 1.26 2003/10/06 22:14:26 jenglish Exp $
 #
 # Copyright (c) 1992-1994 The Regents of the University of California.
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -347,14 +347,6 @@ bind Text <<Redo>> {
     catch { %W edit redo }
 }
 
-if {[string compare $tcl_platform(platform) "windows"]} {
-bind Text <Control-v> {
-    if {!$tk_strictMotif} {
-	tk::TextScrollPages %W 1
-    }
-}
-}
-
 bind Text <Meta-b> {
     if {!$tk_strictMotif} {
 	tk::TextSetCursor %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
@@ -428,6 +420,9 @@ bind Text <Shift-Option-Up> {
 bind Text <Shift-Option-Down> {
     tk::TextKeySelect %W [tk::TextNextPara %W insert]
 }
+bind Text <Control-v> {
+    tk::TextScrollPages %W 1
+}
 
 # End of Mac only bindings
 }
-- 
cgit v0.12