diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2009-04-14 18:09:50 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2009-04-14 18:09:50 (GMT) |
| commit | f75354b91860d456436d24bafb13c80b204f00d4 (patch) | |
| tree | a748b1681b8b336e79171ab699973bc5d0cee1ac | |
| parent | e3e011e82f709cb9995c172a106650db084b2360 (diff) | |
| download | tk-f75354b91860d456436d24bafb13c80b204f00d4.zip tk-f75354b91860d456436d24bafb13c80b204f00d4.tar.gz tk-f75354b91860d456436d24bafb13c80b204f00d4.tar.bz2 | |
Make filebox.test pass cleanly again.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | library/tkfbox.tcl | 4 | ||||
| -rw-r--r-- | library/xmfbox.tcl | 4 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2009-04-14 Donal K. Fellows <dkf@users.sf.net> + + * library/xmfbox.tcl (MotifFDialog_ActivateSEnt): Ensure that the + * library/tkfbox.tcl (Done): dialogs have the + correct levels for [upvar] for accessing the -typevariable var. + 2009-04-13 Donal K. Fellows <dkf@users.sf.net> * library/tk.tcl: Corrected another problem; can't determine the exact diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl index 8030e79..29fc665 100644 --- a/library/tkfbox.tcl +++ b/library/tkfbox.tcl @@ -10,7 +10,7 @@ # "Directory" option menu. The user can select files by clicking on the # file icons or by entering a filename in the "Filename:" entry. # -# RCS: @(#) $Id: tkfbox.tcl,v 1.73 2009/04/13 21:12:52 dkf Exp $ +# RCS: @(#) $Id: tkfbox.tcl,v 1.74 2009/04/14 18:09:50 dkf Exp $ # # Copyright (c) 1994-1998 Sun Microsystems, Inc. # @@ -1133,7 +1133,7 @@ proc ::tk::dialog::file::Done {w {selectFilePath ""}} { && [info exists data(-filetypes)] && [llength $data(-filetypes)] && [info exists data(filterType)] && $data(filterType) ne "" } then { - upvar 3 $data(-typevariable) initialTypeName + upvar 4 $data(-typevariable) initialTypeName set initialTypeName [lindex $data(filterType) 0] } } diff --git a/library/xmfbox.tcl b/library/xmfbox.tcl index 53bfd17..803d0ec 100644 --- a/library/xmfbox.tcl +++ b/library/xmfbox.tcl @@ -4,7 +4,7 @@ # Unix platform. This implementation is used only if the # "::tk_strictMotif" flag is set. # -# RCS: @(#) $Id: xmfbox.tcl,v 1.32 2009/04/13 21:12:52 dkf Exp $ +# RCS: @(#) $Id: xmfbox.tcl,v 1.33 2009/04/14 18:09:50 dkf Exp $ # # Copyright (c) 1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Scriptics Corporation @@ -864,7 +864,7 @@ proc ::tk::MotifFDialog_ActivateSEnt {w} { # Return selected filter if {[info exists data(-typevariable)] && $data(-typevariable) ne "" && [info exists data(-filetypes)] && $data(-filetypes) ne ""} { - upvar 1 $data(-typevariable) initialTypeName + upvar 2 $data(-typevariable) initialTypeName set initialTypeName [lindex $data(-filetypes) $data(fileType) 0] } |