summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <dkf@noemail.net>2004-09-10 22:31:08 (GMT)
committerdkf <dkf@noemail.net>2004-09-10 22:31:08 (GMT)
commitfbfd0b3a0838bfbca3267a35bb65ad827c873bd9 (patch)
tree964de26dca060798970f47f4a819ba7d3785f3e4
parent85e7a448acc371407edaf787c560d5eff872a937 (diff)
downloadtk-fbfd0b3a0838bfbca3267a35bb65ad827c873bd9.zip
tk-fbfd0b3a0838bfbca3267a35bb65ad827c873bd9.tar.gz
tk-fbfd0b3a0838bfbca3267a35bb65ad827c873bd9.tar.bz2
Make sure the state is correctly reset on dialog startup. [Bug 845189]
FossilOrigin-Name: 8f1066e2ae46f292ac3e7b71709326b6498d33a4
-rw-r--r--ChangeLog3
-rw-r--r--library/tkfbox.tcl3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f074c7..67364ce 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 aa833ff..59bdae3 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.47 2004/09/06 23:22:14 hobbs Exp $
+# RCS: @(#) $Id: tkfbox.tcl,v 1.48 2004/09/10 22:31:10 dkf Exp $
#
# Copyright (c) 1994-1998 Sun Microsystems, Inc.
#
@@ -820,6 +820,7 @@ proc ::tk::dialog::file:: {type args} {
set data(cancelBtn) $w.f2.cancel
::tk::dialog::file::SetSelectMode $w $data(-multiple)
}
+ 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,