diff options
| author | das <das> | 2001-11-23 02:04:08 (GMT) |
|---|---|---|
| committer | das <das> | 2001-11-23 02:04:08 (GMT) |
| commit | aa409cc42da819e8ab1d081e7a1f175b33c1c2cf (patch) | |
| tree | 0d0864ac4fc0b0ff178f5869f1600d2c584109c8 /library | |
| parent | 5efa25f6e1ad2a687cac8c1caab6d8c10f978269 (diff) | |
| download | tk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.zip tk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.tar.gz tk-aa409cc42da819e8ab1d081e7a1f175b33c1c2cf.tar.bz2 | |
** upport to 8.4 of mac code changes for 8.3.3 & various new
** changes for 8.4, some already backported to 8.3.4 (patch #435660)
see ChangeLog for details
Diffstat (limited to 'library')
| -rw-r--r-- | library/button.tcl | 5 | ||||
| -rw-r--r-- | library/console.tcl | 4 | ||||
| -rw-r--r-- | library/tk.tcl | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/library/button.tcl b/library/button.tcl index 763c67e..fe32659 100644 --- a/library/button.tcl +++ b/library/button.tcl @@ -4,7 +4,7 @@ # checkbutton, and radiobutton widgets and provides procedures # that help in implementing those bindings. # -# RCS: @(#) $Id: button.tcl,v 1.11 2001/08/01 16:21:11 dgp Exp $ +# RCS: @(#) $Id: button.tcl,v 1.12 2001/11/23 02:04:08 das Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -504,9 +504,8 @@ proc ::tk::ButtonDown w { # If this button has a repeatdelay set up, get it going with an after after cancel $Priv(afterId) + set Priv(repeated) 0 if { ![catch {$w cget -repeatdelay} delay] } { - set delay [$w cget -repeatdelay] - set Priv(repeated) 0 if {$delay > 0} { set Priv(afterId) [after $delay [list tk::ButtonAutoInvoke $w]] } diff --git a/library/console.tcl b/library/console.tcl index 5f4d661..776e7b4 100644 --- a/library/console.tcl +++ b/library/console.tcl @@ -4,7 +4,7 @@ # can be used by non-unix systems that do not have built-in support # for shells. # -# RCS: @(#) $Id: console.tcl,v 1.15 2001/10/19 17:43:52 hobbs Exp $ +# RCS: @(#) $Id: console.tcl,v 1.16 2001/11/23 02:04:17 das Exp $ # # Copyright (c) 1995-1997 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Ajuba Solutions. @@ -446,7 +446,7 @@ proc ::tk::ConsoleBind {w} { bind Console <F9> { eval destroy [winfo child .] if {[string equal $tcl_platform(platform) "macintosh"]} { - source -rsrc Console + if {[catch {source $tk_library:console.tcl}]} {source -rsrc console} } else { source [file join $tk_library console.tcl] } diff --git a/library/tk.tcl b/library/tk.tcl index 5b7ac8c..076bd35 100644 --- a/library/tk.tcl +++ b/library/tk.tcl @@ -3,7 +3,7 @@ # Initialization script normally executed in the interpreter for each # Tk-based application. Arranges class bindings for widgets. # -# RCS: @(#) $Id: tk.tcl,v 1.33 2001/11/15 11:55:26 dkf Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.34 2001/11/23 02:04:39 das Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -349,7 +349,7 @@ switch $::tcl_platform(platform) { event add <<Paste>> <Control-Key-v> <Key-F4> event add <<PasteSelection>> <ButtonRelease-2> event add <<Clear>> <Clear> - event add <<Undo>> <Control-Key-z> + event add <<Undo>> <Control-Key-z> <Key-F1> event add <<Redo>> <Control-Key-Z> } } |