Changeset 6463 for branches

Timestamp:

Aug 3, 2016 12:09:12 AM (8 years ago)

Author:

ldelgass

Message:

merge r6441 from 1.6 branch (loader fix)

Location:

branches/1.7

Files:

• . (modified) (1 prop)
• gui/scripts/loader.tcl (modified) (5 diffs)

branches/1.7/gui/scripts/loader.tcl

@@ -38 +38 @@
 
     private method SetDefaultValue { value }
+    private method EventuallySetDefaultValue { value }
 
     private variable _owner ""    ;# thing managing this control
@@ -246 +247 @@
     set str [string trim [$_owner xml get $path.default]]
     if { $str != "" } {
-        SetDefaultValue $str
+        EventuallySetDefaultValue $str
     }
 }
@@ -285 +286 @@
         $itk_component(combo) value $newval
         return $newval
-
     } elseif {[llength $args] != 0} {
         error "wrong # args: should be \"value ?-check? ?newval?\""
@@ -323 +323 @@
 }
 
-#
-# SetDefaultValue --
+itcl::body Rappture::Loader::SetDefaultValue { value } {
+    $itk_component(combo) value $value
+    _newValue
+}
+#
+#
+# EventuallySetDefaultValue --
 #
 #   Sets the designated default value for the loader.  This must be done
@@ -331 +336 @@
 #   themselves when they try to set their default values.
 #
-itcl::body Rappture::Loader::SetDefaultValue { value } {
-    after 100 [itcl::code $this value $value]
+itcl::body Rappture::Loader::EventuallySetDefaultValue { value } {
+    after 100 [itcl::code $this SetDefaultValue $value]
 }