Changeset 6136 for branches/blt4_trunk/gui/scripts/sidebarframe.tcl

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:

• branches/blt4_trunk/gui/scripts/sidebarframe.tcl (modified) (9 diffs)

branches/blt4_trunk/gui/scripts/sidebarframe.tcl

@@ -29 +29 @@
 option add *SidebarFrame.sashCursor sb_h_double_arrow
 
+itk::usual BltScrollset {
+    #empty
+}
+itk::usual BltTkFrame {
+    #empty
+}
+
+
 itcl::class Rappture::SidebarFrame {
     inherit itk::Widget
@@ -56 +64 @@
     protected method _sash {op x}
     protected method _fixLayout {args}
-    protected method TabIndex { which }
+
+    private method TabIndex { which }
 
     private variable _dispatcher ""  ;# dispatcher for !events
@@ -173 +182 @@
     #
     itk_component add area {
-        Rappture::Scroller $itk_component(sidebar).area \
-            -xscrollmode auto -yscrollmode auto \
-            -highlightthickness 0
-    }
-    $itk_component(area) contents frame
+        blt::tk::frame $itk_component(sidebar).area
+    }
 
     itk_component add controlbar {
@@ -207 +213 @@
         blt::tabset $itk_component(controlbar).tabs \
             -highlightthickness 0 -tearoff 0 -side left \
-            -bd 0 -gap 0 -tabborderwidth 1 \
-            -outerpad 1
+            -bd 1 -gap 1 -outerborderwidth 0 \
+            -outerpad 0 -justify center
     } {
         keep -background -cursor
@@ -214 +220 @@
         rename -highlightbackground -controlbackground controlBackground \
             Background
-        rename -background -controlbackground controlBackground \
+        rename -troughcolor -controlbackground controlBackground \
             Background
     }
@@ -241 +247 @@
     }
 
-    set f [$itk_component(area) contents]
+    set f $itk_component(area)
     set pname "panel[incr _counter]"
     itk_component add $pname {
@@ -249 +255 @@
     $itk_component(tabs) insert $pos $pname \
         -image $panel(-icon) -text "" -padx 0 -pady 0 \
-        -command [itcl::code $this _toggleTab $pname]
+        -command [itcl::code $this _toggleTab]
 
     set _title2panel($panel(-title)) $pname
@@ -365 +371 @@
         $_dispatcher event -idle !layout
     }
-    set n [$itk_component(tabs) index -name $pname]
-    $itk_component(tabs) select $n
+    $itk_component(tabs) select $which
 
     $itk_component(title) configure -text $_panels($pname-title)
 
-    set f [$itk_component(area) contents]
+    set f $itk_component(area)
     foreach w [pack slaves $f] {
         pack forget $w
@@ -497 +502 @@
         pop open
         select $which
-    } elseif {[$itk_component(tabs) index -name $_selected]
-          == [$itk_component(tabs) index -name $which]} {
+    } elseif {[$itk_component(tabs) index $_selected] == $which} {
         pop close
     } else {