* library/choosedir.tcl (tk::dialog::file::chooseDir):

	* library/clrpick.tcl (tk::dialog::file::chooseDir):
	* library/msgbox.tcl (tk::MessageBox):
	* library/tkfbox.tcl (tk::dialog::file):
	* library/xmfbox.tcl (tk::MotifFDialog):
	Revert [Tk patch 568278]. The transient window workaround
	is no longer needed since the fix for [Tk bug 570764]
	solved the problem for withdrawn transients.

6 files changed, 31 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index 31117af..8cda68b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2002-07-22  Mo DeJong  <mdejong@users.sourceforge.net>
+
+	* library/choosedir.tcl (tk::dialog::file::chooseDir):
+	* library/clrpick.tcl (tk::dialog::file::chooseDir):
+	* library/msgbox.tcl (tk::MessageBox):
+	* library/tkfbox.tcl (tk::dialog::file):
+	* library/xmfbox.tcl (tk::MotifFDialog):
+	Revert [Tk patch 568278]. The transient window workaround
+	is no longer needed since the fix for [Tk bug 570764]
+	solved the problem for withdrawn transients.
+
+2002-06-21  Mo DeJong  <mdejong@users.sourceforge.net>
+
+	* tests/wm.test: Add tests to make sure a withdrawn
+	transient does not get remapped by state changes
+	in the master.
+	* unix/tkUnixWm.c (Tk_WmCmd, WmWaitMapProc):
+	* win/tkWinWm.c (Tk_WmCmd, WmWaitVisibilityOrMapProc):
+	Add a WM_TRANSIENT_WITHDRAWN flag that gets set by the
+	withdraw, deiconify, or state wm subcommands. Check
+	this flag before mapping a transient when processing
+	a MapNotify event. [Tk bug 570764]
+	
+ 	workaround
+	is no longer needed since
+
 2002-07-19  Mo DeJong  <mdejong@users.sourceforge.net>
 
 	* unix/configure:
diff --git a/library/choosedir.tcl b/library/choosedir.tcl
index 3875c7b..f52cb94 100644
--- a/library/choosedir.tcl
+++ b/library/choosedir.tcl
@@ -5,7 +5,7 @@
 # Copyright (c) 1998-2000 by Scriptics Corporation.
 # All rights reserved.
 # 
-# RCS: @(#) $Id: choosedir.tcl,v 1.14 2002/06/13 06:17:21 mdejong Exp $
+# RCS: @(#) $Id: choosedir.tcl,v 1.15 2002/07/22 21:25:39 mdejong Exp $
 
 # Make sure the tk::dialog namespace, in which all dialogs should live, exists
 namespace eval ::tk::dialog {}
@@ -96,13 +96,6 @@ proc ::tk::dialog::file::chooseDir:: {args} {
 
     ::tk::RestoreFocusGrab $w $data(ent) withdraw
 
-    # Remove the transient property to insulate the
-    # dialog from changes in the master's state.
-
-    if {[winfo exists $w]} {
-        wm transient $w {}
-    }
-
     # Cleanup traces on selectPath variable
     #
 
diff --git a/library/clrpick.tcl b/library/clrpick.tcl
index f80d752..db5cc09 100644
--- a/library/clrpick.tcl
+++ b/library/clrpick.tcl
@@ -3,7 +3,7 @@
 #	Color selection dialog for platforms that do not support a
 #	standard color selection dialog.
 #
-# RCS: @(#) $Id: clrpick.tcl,v 1.18 2002/06/13 06:17:21 mdejong Exp $
+# RCS: @(#) $Id: clrpick.tcl,v 1.19 2002/07/22 21:25:39 mdejong Exp $
 #
 # Copyright (c) 1996 Sun Microsystems, Inc.
 #
@@ -109,13 +109,6 @@ proc ::tk::dialog::color:: {args} {
     ::tk::RestoreFocusGrab $w $data(okBtn)
     unset data
 
-    # Remove the transient property to insulate the
-    # dialog from changes in the master's state.
-
-    if {[winfo exists $w]} {
-        wm transient $w {}
-    }
-
     return $Priv(selectColor)
 }
 
diff --git a/library/msgbox.tcl b/library/msgbox.tcl
index dce75a5..244f8ae 100644
--- a/library/msgbox.tcl
+++ b/library/msgbox.tcl
@@ -3,7 +3,7 @@
 #	Implements messageboxes for platforms that do not have native
 #	messagebox support.
 #
-# RCS: @(#) $Id: msgbox.tcl,v 1.21 2002/06/28 09:01:58 dkf Exp $
+# RCS: @(#) $Id: msgbox.tcl,v 1.22 2002/07/22 21:25:39 mdejong Exp $
 #
 # Copyright (c) 1994-1997 Sun Microsystems, Inc.
 #
@@ -410,12 +410,5 @@ proc ::tk::MessageBox {args} {
 
     ::tk::RestoreFocusGrab $w $focus
 
-    # Remove the transient property to insulate the
-    # dialog from changes in the master's state.
-
-    if {[winfo exists $w]} {
-        wm transient $w {}
-    }
-
     return $Priv(button)
 }
diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index 0255cad..c494eac 100644
--- a/library/tkfbox.tcl
+++ b/library/tkfbox.tcl
@@ -11,7 +11,7 @@
 #	files by clicking on the file icons or by entering a filename
 #	in the "Filename:" entry.
 #
-# RCS: @(#) $Id: tkfbox.tcl,v 1.36 2002/06/13 06:17:21 mdejong Exp $
+# RCS: @(#) $Id: tkfbox.tcl,v 1.37 2002/07/22 21:25:39 mdejong Exp $
 #
 # Copyright (c) 1994-1998 Sun Microsystems, Inc.
 #
@@ -878,13 +878,6 @@ proc ::tk::dialog::file:: {type args} {
 
     ::tk::RestoreFocusGrab $w $data(ent) withdraw
 
-    # Remove the transient property to insulate the
-    # dialog from changes in the master's state.
-
-    if {[winfo exists $w]} {
-        wm transient $w {}
-    }
-
     # Cleanup traces on selectPath variable
     #
 
diff --git a/library/xmfbox.tcl b/library/xmfbox.tcl
index 74eff0e..f603ace 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.22 2002/06/13 06:17:21 mdejong Exp $
+# RCS: @(#) $Id: xmfbox.tcl,v 1.23 2002/07/22 21:25:39 mdejong Exp $
 #
 # Copyright (c) 1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-2000 Scriptics Corporation
@@ -56,13 +56,6 @@ proc ::tk::MotifFDialog {type args} {
     vwait ::tk::Priv(selectFilePath)
     ::tk::RestoreFocusGrab $w $data(sEnt) withdraw
 
-    # Remove the transient property to insulate the
-    # dialog from changes in the master's state.
-
-    if {[winfo exists $w]} {
-        wm transient $w {}
-    }
-
     return $Priv(selectFilePath)
 }