diff options
| author | hobbs <hobbs> | 2001-03-31 05:46:10 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2001-03-31 05:46:10 (GMT) |
| commit | 09e0c9f40ad5820cfb05bed697dcc58ce136b7b9 (patch) | |
| tree | 08e7650625e80cb346429c6927665e41fbe6156e /library/tk.tcl | |
| parent | 739d4321a3b8dd6e1073ecb19aa5b09eb5893571 (diff) | |
| download | tk-09e0c9f40ad5820cfb05bed697dcc58ce136b7b9.zip tk-09e0c9f40ad5820cfb05bed697dcc58ce136b7b9.tar.gz tk-09e0c9f40ad5820cfb05bed697dcc58ce136b7b9.tar.bz2 | |
* tests/safe.test: added note about correcting failures in
safe.test.
* library/tk.tcl: moved package require msgcat inside if case to
not be used in safe interps.
Diffstat (limited to 'library/tk.tcl')
| -rw-r--r-- | library/tk.tcl | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/library/tk.tcl b/library/tk.tcl index b49362b..daba5d6 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.28 2001/03/30 07:04:35 hobbs Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.29 2001/03/31 05:46:10 hobbs Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -13,11 +13,11 @@ # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # Insist on running with compatible versions of Tcl and Tk. - package require -exact Tk 8.4 package require -exact Tcl 8.4 -package require msgcat + if { ![interp issafe] } { + package require msgcat ::msgcat::mcload [file join $::tk_library msgs] } @@ -314,11 +314,9 @@ switch $tcl_platform(platform) { event add <<Clear>> <Clear> } } - # ---------------------------------------------------------------------- # Read in files that define all of the class bindings. # ---------------------------------------------------------------------- - if {[string compare $tcl_platform(platform) "macintosh"] && \ [string compare {} $tk_library]} { source [file join $tk_library button.tcl] @@ -330,7 +328,6 @@ if {[string compare $tcl_platform(platform) "macintosh"] && \ source [file join $tk_library spinbox.tcl] source [file join $tk_library text.tcl] } - # ---------------------------------------------------------------------- # Default bindings for keyboard traversal. # ---------------------------------------------------------------------- |