Ignore:
Timestamp:
Mar 17, 2016 7:56:48 PM (8 years ago)
Author:
dkearney
Message:

removing hardcoded path to tcl/tk source header files
tcl/tk source path is provided by TCL_SRC_DIR and TK_SRC_DIR in configure file
updating parameter lists for RpSqueezer?.c calls to tcl/tk 8.5 functions
updating sidebarframe.tcl widget for blt4

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/blt4_trunk/gui/scripts/sidebarframe.tcl

    r5659 r6136  
    2929option add *SidebarFrame.sashCursor sb_h_double_arrow
    3030
     31itk::usual BltScrollset {
     32    #empty
     33}
     34itk::usual BltTkFrame {
     35    #empty
     36}
     37
     38
    3139itcl::class Rappture::SidebarFrame {
    3240    inherit itk::Widget
     
    5664    protected method _sash {op x}
    5765    protected method _fixLayout {args}
    58     protected method TabIndex { which }
     66
     67    private method TabIndex { which }
    5968
    6069    private variable _dispatcher ""  ;# dispatcher for !events
     
    173182    #
    174183    itk_component add area {
    175         Rappture::Scroller $itk_component(sidebar).area \
    176             -xscrollmode auto -yscrollmode auto \
    177             -highlightthickness 0
    178     }
    179     $itk_component(area) contents frame
     184        blt::tk::frame $itk_component(sidebar).area
     185    }
    180186
    181187    itk_component add controlbar {
     
    207213        blt::tabset $itk_component(controlbar).tabs \
    208214            -highlightthickness 0 -tearoff 0 -side left \
    209             -bd 0 -gap 0 -tabborderwidth 1 \
    210             -outerpad 1
     215            -bd 1 -gap 1 -outerborderwidth 0 \
     216            -outerpad 0 -justify center
    211217    } {
    212218        keep -background -cursor
     
    214220        rename -highlightbackground -controlbackground controlBackground \
    215221            Background
    216         rename -background -controlbackground controlBackground \
     222        rename -troughcolor -controlbackground controlBackground \
    217223            Background
    218224    }
     
    241247    }
    242248
    243     set f [$itk_component(area) contents]
     249    set f $itk_component(area)
    244250    set pname "panel[incr _counter]"
    245251    itk_component add $pname {
     
    249255    $itk_component(tabs) insert $pos $pname \
    250256        -image $panel(-icon) -text "" -padx 0 -pady 0 \
    251         -command [itcl::code $this _toggleTab $pname]
     257        -command [itcl::code $this _toggleTab]
    252258
    253259    set _title2panel($panel(-title)) $pname
     
    365371        $_dispatcher event -idle !layout
    366372    }
    367     set n [$itk_component(tabs) index -name $pname]
    368     $itk_component(tabs) select $n
     373    $itk_component(tabs) select $which
    369374
    370375    $itk_component(title) configure -text $_panels($pname-title)
    371376
    372     set f [$itk_component(area) contents]
     377    set f $itk_component(area)
    373378    foreach w [pack slaves $f] {
    374379        pack forget $w
     
    497502        pop open
    498503        select $which
    499     } elseif {[$itk_component(tabs) index -name $_selected]
    500           == [$itk_component(tabs) index -name $which]} {
     504    } elseif {[$itk_component(tabs) index $_selected] == $which} {
    501505        pop close
    502506    } else {
Note: See TracChangeset for help on using the changeset viewer.