From de2bd3e7b1c90ac227eb59dd99dda24ce4ef99d7 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 27 Oct 2004 16:37:57 +0000 Subject: * library/xmfbox.tcl (MotifFDialog_BuildUI): Fix [Bug 987169] in the Motif file dialogs as well. Backport of DKF bug fix. --- ChangeLog | 5 +++++ library/xmfbox.tcl | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c28397..2b56cb4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-10-27 Don Porter + + * library/xmfbox.tcl (MotifFDialog_BuildUI): Fix [Bug 987169] in + the Motif file dialogs as well. Backport of DKF bug fix. + 2004-10-26 David Gravereaux * generic/tkInt.h: Backport of shutdown safety mods from the HEAD diff --git a/library/xmfbox.tcl b/library/xmfbox.tcl index 67e2804..6093da3 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.25.2.1 2004/10/27 16:37:59 dgp 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) [list tk::MotifFDialog_ActivateFEnt $w] bind $data(sEnt) [list tk::MotifFDialog_ActivateSEnt $w] + bind $w [list tk::MotifFDialog_CancelCmd $w] + bind $w.bot {set ::tk::Priv(selectFilePath) {}} wm protocol $w WM_DELETE_WINDOW [list tk::MotifFDialog_CancelCmd $w] } -- cgit v0.12