Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.7

  • branches/1.7/gui/scripts/loader.tcl

    r6313 r6463  
    3838
    3939    private method SetDefaultValue { value }
     40    private method EventuallySetDefaultValue { value }
    4041
    4142    private variable _owner ""    ;# thing managing this control
     
    246247    set str [string trim [$_owner xml get $path.default]]
    247248    if { $str != "" } {
    248         SetDefaultValue $str
     249        EventuallySetDefaultValue $str
    249250    }
    250251}
     
    285286        $itk_component(combo) value $newval
    286287        return $newval
    287 
    288288    } elseif {[llength $args] != 0} {
    289289        error "wrong # args: should be \"value ?-check? ?newval?\""
     
    323323}
    324324
    325 #
    326 # SetDefaultValue --
     325itcl::body Rappture::Loader::SetDefaultValue { value } {
     326    $itk_component(combo) value $value
     327    _newValue
     328}
     329#
     330#
     331# EventuallySetDefaultValue --
    327332#
    328333#   Sets the designated default value for the loader.  This must be done
     
    331336#   themselves when they try to set their default values.
    332337#
    333 itcl::body Rappture::Loader::SetDefaultValue { value } {
    334     after 100 [itcl::code $this value $value]
     338itcl::body Rappture::Loader::EventuallySetDefaultValue { value } {
     339    after 100 [itcl::code $this SetDefaultValue $value]
    335340}
    336341
Note: See TracChangeset for help on using the changeset viewer.