diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2004-08-11 21:24:25 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2004-08-11 21:24:25 (GMT) |
| commit | 35a62312c2abb7fe1b09f1ccf4f04599f13bed0f (patch) | |
| tree | 5bc1e4d8ab829d16aa4f1b3114e62eab33c662f2 /library/xmfbox.tcl | |
| parent | 2755967cfd01a2ddb9efa3be42533a6dbaba86a6 (diff) | |
| download | tk-35a62312c2abb7fe1b09f1ccf4f04599f13bed0f.zip tk-35a62312c2abb7fe1b09f1ccf4f04599f13bed0f.tar.gz tk-35a62312c2abb7fe1b09f1ccf4f04599f13bed0f.tar.bz2 | |
More fixing of [Bug 987169] and simple support for [FRQ 979101]
Diffstat (limited to 'library/xmfbox.tcl')
| -rw-r--r-- | library/xmfbox.tcl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/library/xmfbox.tcl b/library/xmfbox.tcl index 67e2804..db79815 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.25 2003/02/18 21:19:35 hobbs Exp $ +# RCS: @(#) $Id: xmfbox.tcl,v 1.26 2004/08/11 21:24:25 dkf Exp $ # # Copyright (c) 1996 Sun Microsystems, Inc. # Copyright (c) 1998-2000 Scriptics Corporation @@ -54,9 +54,10 @@ proc ::tk::MotifFDialog {type args} { # restore any grab that was in effect. vwait ::tk::Priv(selectFilePath) + set result $Priv(selectFilePath) ::tk::RestoreFocusGrab $w $data(sEnt) withdraw - return $Priv(selectFilePath) + return $result } # ::tk::MotifFDialog_Create -- @@ -378,6 +379,8 @@ proc ::tk::MotifFDialog_BuildUI {w} { bind $data(fEnt) <Return> [list tk::MotifFDialog_ActivateFEnt $w] bind $data(sEnt) <Return> [list tk::MotifFDialog_ActivateSEnt $w] + bind $w <Escape> [list tk::MotifFDialog_CancelCmd $w] + bind $w.bot <Destroy> {set ::tk::Priv(selectFilePath) {}} wm protocol $w WM_DELETE_WINDOW [list tk::MotifFDialog_CancelCmd $w] } |