summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2004-09-10 20:48:40 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2004-09-10 20:48:40 (GMT)
commitbf1948233b04bfe21eb41b08eae7c2111401b7d2 (patch)
treeb980dfd0bd2c7df7eca7a4b5316fbef4c6e2762a
parent57b6164964a724b33017af9cff385757ad4d1adb (diff)
downloadtk-bf1948233b04bfe21eb41b08eae7c2111401b7d2.zip
tk-bf1948233b04bfe21eb41b08eae7c2111401b7d2.tar.gz
tk-bf1948233b04bfe21eb41b08eae7c2111401b7d2.tar.bz2
Stop tk_strictMotif poisoning of the widget demo [Bug 1013942]
-rw-r--r--ChangeLog5
-rw-r--r--library/demos/filebox.tcl6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ccadb9e..b1c1cb0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-10 Donal K. Fellows <donal.k.fellows@man.ac.uk>
+
+ * library/demos/filebox.tcl: Stop the use of tk_strictMotif from
+ poisoning the rest of the widget demo. [Bug 1013942]
+
2004-09-10 Jeff Hobbs <jeffh@ActiveState.com>
* win/tkWinWm.c (ActivateWindow): SetFocus to grab window when
diff --git a/library/demos/filebox.tcl b/library/demos/filebox.tcl
index 4401d06..bb6f251 100644
--- a/library/demos/filebox.tcl
+++ b/library/demos/filebox.tcl
@@ -2,7 +2,7 @@
#
# This demonstration script prompts the user to select a file.
#
-# RCS: @(#) $Id: filebox.tcl,v 1.3 2001/06/14 10:56:58 dkf Exp $
+# RCS: @(#) $Id: filebox.tcl,v 1.3.4.1 2004/09/10 20:48:41 dkf Exp $
if {![info exists widgetDemo]} {
error "This script should be run from the \"widget\" demo."
@@ -39,6 +39,10 @@ if {![string compare $tcl_platform(platform) unix]} {
checkbutton $w.strict -text "Use Motif Style Dialog" \
-variable tk_strictMotif -onvalue 1 -offvalue 0
pack $w.strict -anchor c
+
+ # This binding ensures that we don't run the rest of the demos
+ # with motif style interactions
+ bind $w.strict <Destroy> {set tk_strictMotif 0}
}
proc fileDialog {w ent operation} {