From 7373d55c554d351acbc651d63657917d6e8a2237 Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Fri, 22 Nov 2019 11:37:04 -0500 Subject: [PATCH] Corrected a problem from the last commit that causes error messages in the toolkit Tk window when any parameter is modified, due do the use of a variable before its being defined in the dialog update. --- tcltk/toolkit.tcl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tcltk/toolkit.tcl b/tcltk/toolkit.tcl index e044101d..c62df42d 100644 --- a/tcltk/toolkit.tcl +++ b/tcltk/toolkit.tcl @@ -568,12 +568,16 @@ proc magic::add_dependency {callback gencell_type library args} { #---------------------------------------------------------- proc magic::update_dialog {callback pname gencell_type library} { + set pdefaults [${library}::${gencell_type}_defaults] + set parameters [dict merge $pdefaults [magic::gencell_getparams]] + if {[dict exists $parameters gencell]} { # Setting special parameter "gencell" forces the gencell to change type set gencell_type [dict get $parameters gencell] + set pdefaults [${library}::${gencell_type}_defaults] + set parameters [dict merge $pdefaults [magic::gencell_getparams]] } - set pdefaults [${library}::${gencell_type}_defaults] - set parameters [dict merge $pdefaults [magic::gencell_getparams]] + if {$callback != {}} { set parameters [$callback $pname $parameters] }