Changeset 6136

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

Location:

branches/blt4_trunk

Files:

• configure (modified) (3 diffs)
• configure.in (modified) (2 diffs)
• gui/scripts/sidebarframe.tcl (modified) (9 diffs)
• gui/src/Makefile.in (modified) (2 diffs)
• gui/src/RpSqueezer.c (modified) (1 diff)

branches/blt4_trunk/configure

@@ -630 +630 @@
 TK_XLIBSW
 TK_VERSION
+TK_SRC_DIR
 TK_LIB_SPEC
 TK_INC_SPEC
 TCL_VERSION
+TCL_SRC_DIR
 TCL_SHLIB_SUFFIX
 TCL_SHLIB_LDFLAGS
@@ -7349 +7351 @@
 done
 
+TK_VERSION="8.4"
+for dir in \
+ ${exec_prefix} \
+ ${exec_prefix}/lib ; do
+  tkconfig="${dir}/tkConfig.sh"
+  if test -f "$tkconfig" ; then
+    . $tkconfig
+    break
+  fi
+done
+
 
 # Check whether --with-ffmpeg was given.
@@ -10137 +10150 @@
 
 MAKE=${make_command}
+
+
 
 

branches/blt4_trunk/configure.in

@@ -151 +151 @@
   if test -f "$tclconfig" ; then
     . $tclconfig
+    break
+  fi
+done
+
+TK_VERSION="8.4"
+for dir in \
+ ${exec_prefix} \
+ ${exec_prefix}/lib ; do
+  tkconfig="${dir}/tkConfig.sh"
+  if test -f "$tkconfig" ; then
+    . $tkconfig
     break
   fi
@@ -451 +462 @@
 AC_SUBST(TCL_SHLIB_LDFLAGS)
 AC_SUBST(TCL_SHLIB_SUFFIX)
+AC_SUBST(TCL_SRC_DIR)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TK_INC_SPEC)
 AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TK_SRC_DIR)
 AC_SUBST(TK_VERSION)
 AC_SUBST(TK_XLIBSW)

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 {

branches/blt4_trunk/gui/src/Makefile.in

@@ -26 +26 @@
 LIB_RUNTIME_DIR = @LIB_RUNTIME_DIR@
 CFLAGS          = @CFLAGS@ -fPIC
+TCL_SRC_DIR     = @TCL_SRC_DIR@
 TCL_VERSION     = @TCL_VERSION@
-TCLTK_SRCS      = -I../../../runtime/tcl8.4.19/generic -I../../../runtime/tk8.4.19/generic -I../../../runtime/tk8.4.19/unix
 TCL_LIB_SPEC    = @TCL_LIB_SPEC@
+TK_SRC_DIR      = @TK_SRC_DIR@
 TK_LIB_SPEC     = @TK_LIB_SPEC@
-TK_XLIBSW       = @TK_XLIBSW@
+TK_XLIBSW       = @TK_XLIBSW@
+# FIXME: should be using TK_INCLUDES from TEA_PRIVATE_TK_HEADERS
+TCLTK_INCLUDES  = -I$(TCL_SRC_DIR)/generic -I$(TK_SRC_DIR)/generic -I$(TK_SRC_DIR)/unix
 VTK_VERSION     = @VTK_VERSION@
 VTK_TCL_DIR     = @VTK_TCL_DIR@
@@ -95 +98 @@
 
 RpListbox.o: RpListbox.c
-        $(CC) $(CC_SWITCHES) $(TCLTK_SRCS) -c $? 
+        $(CC) $(CC_SWITCHES) $(TCLTK_INCLUDES) -c $? 
 .cc.o:
         $(CXX) $(CXX_SWITCHES) -c $?

branches/blt4_trunk/gui/src/RpSqueezer.c

@@ -199 +199 @@
         }
     }
-    Tk_PhotoSetSize(destPhoto, destw, srch);
-    Tk_PhotoPutBlock(destPhoto, &destBlock, 0, 0,
+    Tk_PhotoSetSize(NULL, destPhoto, destw, srch);
+    Tk_PhotoPutBlock(NULL, destPhoto, &destBlock, 0, 0,
         destBlock.width, destBlock.height, TK_PHOTO_COMPOSITE_SET);