summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--library/entry.tcl5
-rw-r--r--library/ttk/entry.tcl5
3 files changed, 19 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e3b5f2..58a56f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,19 @@
+2010-03-17 Donal K. Fellows <dkf@users.sf.net>
+
+ * library/entry.tcl: [Bug 2971663]: Make the <Up> and <Down> keys
+ * library/ttk/entry.tcl: explicitly do nothing, since Tk-on-Cocoa will
+ generate (invisible zero-width) characters for them otherwise. The
+ explicitly empty bindings are harmless on other platforms.
+
2010-03-16 Jan Nijtmans <nijtmans@users.sf.net>
- * unix/.cvsignore Ignore .a and .so
+ * unix/.cvsignore: Ignore .a and .so
2010-03-12 Jan Nijtmans <nijtmans@users.sf.net>
- * win/rules.vc Fix [Tcl Bug 2967340]: Static build failure
- * win/makefile.vc
- * win/.cvsignore
+ * win/rules.vc: Fix [Tcl Bug 2967340]: Static build failure
+ * win/makefile.vc:
+ * win/.cvsignore:
2010-03-12 Donal K. Fellows <dkf@users.sf.net>
diff --git a/library/entry.tcl b/library/entry.tcl
index b92f8b9..74e70ad 100644
--- a/library/entry.tcl
+++ b/library/entry.tcl
@@ -3,7 +3,7 @@
# This file defines the default bindings for Tk entry widgets and provides
# procedures that help in implementing those bindings.
#
-# RCS: @(#) $Id: entry.tcl,v 1.27 2010/01/06 18:37:36 dkf Exp $
+# RCS: @(#) $Id: entry.tcl,v 1.28 2010/03/17 09:27:23 dkf Exp $
#
# Copyright (c) 1992-1994 The Regents of the University of California.
# Copyright (c) 1994-1997 Sun Microsystems, Inc.
@@ -215,6 +215,9 @@ bind Entry <Next> {# nothing}
if {[tk windowingsystem] eq "aqua"} {
bind Entry <Command-KeyPress> {# nothing}
}
+# Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
+bind Entry <Down> {# nothing}
+bind Entry <Up> {# nothing}
# On Windows, paste is done using Shift-Insert. Shift-Insert already
# generates the <<Paste>> event, so we don't need to do anything here.
diff --git a/library/ttk/entry.tcl b/library/ttk/entry.tcl
index a3a81a3..0e1194f 100644
--- a/library/ttk/entry.tcl
+++ b/library/ttk/entry.tcl
@@ -1,5 +1,5 @@
#
-# $Id: entry.tcl,v 1.7 2010/01/06 18:37:37 dkf Exp $
+# $Id: entry.tcl,v 1.8 2010/03/17 09:27:23 dkf Exp $
#
# DERIVED FROM: tk/library/entry.tcl r1.22
#
@@ -137,6 +137,9 @@ bind TEntry <Key-Tab> {# nothing}
if {[tk windowingsystem] eq "aqua"} {
bind TEntry <Command-KeyPress> {# nothing}
}
+# Tk-on-Cocoa generates characters for these two keys. [Bug 2971663]
+bind TEntry <Down> {# nothing}
+bind TEntry <Up> {# nothing}
## Additional emacs-like bindings:
#