summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--library/tkfbox.tcl9
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 954f120..89c03cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-29 Eric Melski <ericm@ajubasolutions.com>
+
+ * library/tkfbox.tcl (::tk::dialog::file::Update): Corrected
+ handling of multi-pattern filters (eg, "* *.*"), which was broken
+ by the getOpenFile performance patches applied earlier.
+
2000-08-24 Eric Melski <ericm@ajubasolutions.com>
* doc/toplevel.n:
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index 7044af0..ab802f8 100644
--- a/library/tkfbox.tcl
+++ b/library/tkfbox.tcl
@@ -11,7 +11,7 @@
# files by clicking on the file icons or by entering a filename
# in the "Filename:" entry.
#
-# RCS: @(#) $Id: tkfbox.tcl,v 1.22 2000/07/19 00:20:02 ericm Exp $
+# RCS: @(#) $Id: tkfbox.tcl,v 1.23 2000/08/29 20:17:12 ericm Exp $
#
# Copyright (c) 1994-1998 Sun Microsystems, Inc.
#
@@ -1261,8 +1261,11 @@ rSASvJTGhnhcV3EJlo3kh53ltF5nAhQAOw==}]
} else {
set files {}
foreach f $completeFileList {
- if { [string match $data(filter) $f] } {
- lappend files $f
+ foreach pat $data(filter) {
+ if { [string match $pat $f] } {
+ lappend files $f
+ break
+ }
}
}
}