diff options
| author | hobbs <hobbs> | 2007-10-25 21:44:21 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2007-10-25 21:44:21 (GMT) |
| commit | 74c0382ad182c608bc1418a8da6bbc6a368cf801 (patch) | |
| tree | 0e316eba5bf980a1124288597f60247798da5ef9 /library/xmfbox.tcl | |
| parent | 4ce5204218fe597d1a9e90e874f1c716b2dcf411 (diff) | |
| download | tk-74c0382ad182c608bc1418a8da6bbc6a368cf801.zip tk-74c0382ad182c608bc1418a8da6bbc6a368cf801.tar.gz tk-74c0382ad182c608bc1418a8da6bbc6a368cf801.tar.bz2 | |
* doc/getOpenFile.n: TIP#242 implementation of -typevariable to
* library/tkfbox.tcl: return type of selected file in file dialogs.
* library/xmfbox.tcl: [Bug #1156388]
* macosx/tkMacOSXDialog.c:
* tests/filebox.test:
* tests/winDialog.test:
* win/tkWinDialog.c:
Diffstat (limited to 'library/xmfbox.tcl')
| -rw-r--r-- | library/xmfbox.tcl | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/library/xmfbox.tcl b/library/xmfbox.tcl index 2e68a15..5036cd3 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.29 2006/03/17 11:13:15 patthoyts Exp $ +# RCS: @(#) $Id: xmfbox.tcl,v 1.30 2007/10/25 21:44:22 hobbs Exp $ # # Copyright (c) 1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Scriptics Corporation @@ -157,7 +157,22 @@ proc ::tk::MotifFDialog_FileTypes {w} { # The filetypes radiobuttons # set data(fileType) $data(-defaulttype) + # Default type to first entry + set initialTypeName [lindex $data(-filetypes) 0 0] + if {($data(-typevariable) ne "") + && [uplevel 4 [list info exists $data(-typevariable)]]} { + set initialTypeName [uplevel 4 [list set $data(-typevariable)]] + } + set ix 0 set data(fileType) 0 + foreach fltr $data(-filetypes) { + set fname [lindex $fltr 0] + if {[string first $initialTypeName $fname] == 0} { + set data(fileType) $ix + break + } + incr ix + } MotifFDialog_SetFilter $w [lindex $data(-filetypes) $data(fileType)] @@ -176,7 +191,7 @@ proc ::tk::MotifFDialog_FileTypes {w} { -text $title \ -variable ::tk::dialog::file::[winfo name $w](fileType) \ -value $cnt \ - -command "[list tk::MotifFDialog_SetFilter $w $type]" + -command [list tk::MotifFDialog_SetFilter $w $type] pack $f.b$cnt -side left incr cnt } @@ -226,6 +241,7 @@ proc ::tk::MotifFDialog_Config {dataName type argList} { {-initialfile "" "" ""} {-parent "" "" "."} {-title "" "" ""} + {-typevariable "" "" ""} } if {$type eq "open"} { lappend specs {-multiple "" "" "0"} @@ -841,10 +857,17 @@ proc ::tk::MotifFDialog_ActivateSEnt {w} { return } } - + lappend newFileList $item } + # Return selected filter + if {[info exists data(-typevariable)] && $data(-typevariable) ne "" + && [info exists data(-filetypes)] && $data(-filetypes) ne ""} { + upvar 2 $data(-typevariable) initialTypeName + set initialTypeName [lindex $data(-filetypes) $data(fileType) 0] + } + if {$data(-multiple) != 0} { set Priv(selectFilePath) $newFileList } else { |