fixed reinitialization bugs

FossilOrigin-Name: 9cf66134bc3912d3555a10503cc832d42c821dee

1 files changed, 16 insertions, 5 deletions

diff --git a/library/tkfbox.tcl b/library/tkfbox.tcl
index dc0c267..52a5fb8 100644
--- a/library/tkfbox.tcl
+++ b/library/tkfbox.tcl
@@ -653,6 +653,17 @@ proc tkFDialog {args} {
     } elseif {[string compare [winfo class $w] TkFDialog]} {
 	destroy $w
 	tkFDialog_Create $w
+    } else {
+	set data(dirMenuBtn) $w.f1.menu
+	set data(dirMenu) $w.f1.menu.menu
+	set data(upBtn) $w.f1.up
+	set data(icons) $w.icons
+	set data(ent) $w.f2.ent
+	set data(typeMenuLab) $w.f3.lab
+	set data(typeMenuBtn) $w.f3.menu
+	set data(typeMenu) $data(typeMenuBtn).m
+	set data(okBtn) $w.f2.ok
+	set data(cancelBtn) $w.f3.cancel
     }
     wm transient $w $data(-parent)
 
@@ -950,18 +961,18 @@ proc tkFDialog_UpdateWhenIdle {w} {
 #	directories.
 #
 proc tkFDialog_Update {w} {
-    set dataName [winfo name $w]
-    upvar #0 $dataName data
-    global tk_library tkPriv
 
     # This proc may be called within an idle handler. Make sure that the
     # window has not been destroyed before this proc is called
     if {![winfo exists $w] || [string compare [winfo class $w] TkFDialog]} {
 	return
-    } else {
-	catch {unset data(updateId)}
     }
 
+    set dataName [winfo name $w]
+    upvar #0 $dataName data
+    global tk_library tkPriv
+    catch {unset data(updateId)}
+
     set TRANSPARENT_GIF_COLOR [$w cget -bg]
     if ![info exists tkPriv(folderImage)] {
 	set tkPriv(folderImage) [image create photo -data {