summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2004-09-10 22:28:29 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2004-09-10 22:28:29 (GMT)
commit3fce25d36ba52bf2b0141fa307ef0c262d145c12 (patch)
treee2daa69751979587e1c96c34815a5d5a2f3493fb
parent14704281d8afd8bcb9aeca639fd7db1a6df2a2d9 (diff)
downloadtk-3fce25d36ba52bf2b0141fa307ef0c262d145c12.zip
tk-3fce25d36ba52bf2b0141fa307ef0c262d145c12.tar.gz
tk-3fce25d36ba52bf2b0141fa307ef0c262d145c12.tar.bz2
More state resetting on dialog start. [Bug 845189]
-rw-r--r--ChangeLog3
-rw-r--r--library/tkfbox.tcl4
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ab7ad73..1750472 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2004-09-10 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+ * library/tkfbox.tcl (::tk::dialog::file::): Make sure that the
+ state is reset properly when starting to run the dialog. [Bug 845189]
+
* library/demos/filebox.tcl: Stop the use of tk_strictMotif from
poisoning the rest of the widget demo. [Bug 1013942]
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index bedb32f..26606fb 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.38.2.6 2004/09/06 23:21:48 hobbs Exp $
+# RCS: @(#) $Id: tkfbox.tcl,v 1.38.2.7 2004/09/10 22:28:30 dkf Exp $
#
# Copyright (c) 1994-1998 Sun Microsystems, Inc.
#
@@ -820,6 +820,8 @@ proc ::tk::dialog::file:: {type args} {
set data(cancelBtn) $w.f2.cancel
::tk::dialog::file::SetSelectMode $w $data(-multiple)
}
+ # Make sure subseqent uses of this dialog are independent [Bug 845189]
+ catch {unset data(extUsed)}
# Dialog boxes should be transient with respect to their parent,
# so that they will always stay on top of their parent window. However,