diff options
| author | ericm <ericm> | 2000-06-30 20:19:06 (GMT) |
|---|---|---|
| committer | ericm <ericm> | 2000-06-30 20:19:06 (GMT) |
| commit | 4ea21e7c7a8efc810e06538dc01f09547fce9e87 (patch) | |
| tree | ac4757d8dfa96eec851c416a384f4d2852ab97fb /library | |
| parent | 360ba5a659a8fac08458227696f08e8786486821 (diff) | |
| download | tk-4ea21e7c7a8efc810e06538dc01f09547fce9e87.zip tk-4ea21e7c7a8efc810e06538dc01f09547fce9e87.tar.gz tk-4ea21e7c7a8efc810e06538dc01f09547fce9e87.tar.bz2 | |
* tests/filebox.test: Adjusted tests to accomodate -multiple.
* library/xmfbox.tcl: Adjusted arguments list construction such
that -multiple is not presented as an option for tk_getSaveFile.
* library/tk.tcl: Added test for safe interpreter status before
attempting to load message catalogs (which is impossible in a
standard safe interpreter). This means that SafeTk will not have
localized dialogs, unless a means is found for loading the message
catalog files.
Diffstat (limited to 'library')
| -rw-r--r-- | library/tk.tcl | 6 | ||||
| -rw-r--r-- | library/xmfbox.tcl | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/library/tk.tcl b/library/tk.tcl index 32de9e1..b43f4df 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.23 2000/06/30 06:38:38 ericm Exp $ +# RCS: @(#) $Id: tk.tcl,v 1.24 2000/06/30 20:19:06 ericm Exp $ # # Copyright (c) 1992-1994 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -17,7 +17,9 @@ package require -exact Tk 8.4 package require -exact Tcl 8.4 package require msgcat -::msgcat::mcload [file join $::tk_library msgs] +if { ![interp issafe] } { + ::msgcat::mcload [file join $::tk_library msgs] +} # Add Tk's directory to the end of the auto-load search path, if it # isn't already on the path: diff --git a/library/xmfbox.tcl b/library/xmfbox.tcl index 5a0dfb0..1861abc 100644 --- a/library/xmfbox.tcl +++ b/library/xmfbox.tcl @@ -4,7 +4,7 @@ # Unix platform. This implementation is used only if the # "tk_strictMotif" flag is set. # -# RCS: @(#) $Id: xmfbox.tcl,v 1.13 2000/06/30 06:38:39 ericm Exp $ +# RCS: @(#) $Id: xmfbox.tcl,v 1.14 2000/06/30 20:19:07 ericm Exp $ # # Copyright (c) 1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Scriptics Corporation @@ -217,9 +217,12 @@ proc tkMotifFDialog_Config {dataName type argList} { {-initialfile "" "" ""} {-parent "" "" "."} {-title "" "" ""} - {-multiple "" "" "0"} + } + if { [string equal $type "open"] } { + lappend specs {-multiple "" "" "0"} } + set data(-multiple) 0 # 2: default values depending on the type of the dialog # if {![info exists data(selectPath)]} { |