diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2004-09-10 20:46:18 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2004-09-10 20:46:18 (GMT) |
| commit | e535b4a6abd8efbd2a684aa35c64ce84a7fb1cec (patch) | |
| tree | 29580e8f14c8df24363ea29a33db3fb41fa3313d | |
| parent | 73e2df4a732736cb5574fff5423b2657f81fed60 (diff) | |
| download | tk-e535b4a6abd8efbd2a684aa35c64ce84a7fb1cec.zip tk-e535b4a6abd8efbd2a684aa35c64ce84a7fb1cec.tar.gz tk-e535b4a6abd8efbd2a684aa35c64ce84a7fb1cec.tar.bz2 | |
Prevent tk_strictMotif poisoning of the Widget demo [Bug 1013942]
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | library/demos/filebox.tcl | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -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 860b29b..3fae38d 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.4 2003/08/20 23:02:18 hobbs Exp $ +# RCS: @(#) $Id: filebox.tcl,v 1.5 2004/09/10 20:46:19 dkf Exp $ if {![info exists widgetDemo]} { error "This script should be run from the \"widget\" demo." @@ -33,10 +33,14 @@ foreach i {open save} { pack $f -fill x -padx 1c -pady 3 } -if {![string compare $tcl_platform(platform) unix]} { +if {$tcl_platform(platform) eq "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} { |