summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2016-10-12 18:34:49 (GMT)
committerfvogel <fvogelnew1@free.fr>2016-10-12 18:34:49 (GMT)
commit5aa32dcd815719855c977ec975dd97e391cbf8b3 (patch)
tree4c4334384951dd14ae32fce233e05a15430d7792
parent8bb0c09912bcf8aaa8d5366525d7895c0fe96ad7 (diff)
downloadtk-5aa32dcd815719855c977ec975dd97e391cbf8b3.zip
tk-5aa32dcd815719855c977ec975dd97e391cbf8b3.tar.gz
tk-5aa32dcd815719855c977ec975dd97e391cbf8b3.tar.bz2
Fixed [3588460fff] - -typevariable buggy in X11. Patch from Christian Gollwitzer
-rw-r--r--library/tkfbox.tcl5
1 files changed, 4 insertions, 1 deletions
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index a52465a..f73fdc5 100644
--- a/library/tkfbox.tcl
+++ b/library/tkfbox.tcl
@@ -310,6 +310,7 @@ proc ::tk::dialog::file::Config {dataName type argList} {
# 5. Parse the -filetypes option
#
+ set data(origfiletypes) $data(-filetypes)
set data(-filetypes) [::tk::FDGetFileTypes $data(-filetypes)]
if {![winfo exists $data(-parent)]} {
@@ -1119,7 +1120,9 @@ proc ::tk::dialog::file::Done {w {selectFilePath ""}} {
&& [info exists data(filterType)] && $data(filterType) ne ""
} then {
upvar #0 $data(-typevariable) typeVariable
- set typeVariable [lindex $data(filterType) 0]
+ set typeVariable [lindex $data(origfiletypes) \
+ [lsearch -exact $data(-filetypes) $data(filterType)] 0]
+
}
}
bind $data(okBtn) <Destroy> {}