Changeset 6136


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

Location:
branches/blt4_trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/blt4_trunk/configure

    r6129 r6136  
    630630TK_XLIBSW
    631631TK_VERSION
     632TK_SRC_DIR
    632633TK_LIB_SPEC
    633634TK_INC_SPEC
    634635TCL_VERSION
     636TCL_SRC_DIR
    635637TCL_SHLIB_SUFFIX
    636638TCL_SHLIB_LDFLAGS
     
    73497351done
    73507352
     7353TK_VERSION="8.4"
     7354for dir in \
     7355 ${exec_prefix} \
     7356 ${exec_prefix}/lib ; do
     7357  tkconfig="${dir}/tkConfig.sh"
     7358  if test -f "$tkconfig" ; then
     7359    . $tkconfig
     7360    break
     7361  fi
     7362done
     7363
    73517364
    73527365# Check whether --with-ffmpeg was given.
     
    1013710150
    1013810151MAKE=${make_command}
     10152
     10153
    1013910154
    1014010155
  • branches/blt4_trunk/configure.in

    r6129 r6136  
    151151  if test -f "$tclconfig" ; then
    152152    . $tclconfig
     153    break
     154  fi
     155done
     156
     157TK_VERSION="8.4"
     158for dir in \
     159 ${exec_prefix} \
     160 ${exec_prefix}/lib ; do
     161  tkconfig="${dir}/tkConfig.sh"
     162  if test -f "$tkconfig" ; then
     163    . $tkconfig
    153164    break
    154165  fi
     
    451462AC_SUBST(TCL_SHLIB_LDFLAGS)
    452463AC_SUBST(TCL_SHLIB_SUFFIX)
     464AC_SUBST(TCL_SRC_DIR)
    453465AC_SUBST(TCL_VERSION)
    454466AC_SUBST(TK_INC_SPEC)
    455467AC_SUBST(TK_LIB_SPEC)
     468AC_SUBST(TK_SRC_DIR)
    456469AC_SUBST(TK_VERSION)
    457470AC_SUBST(TK_XLIBSW)
  • 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 {
  • branches/blt4_trunk/gui/src/Makefile.in

    r4212 r6136  
    2626LIB_RUNTIME_DIR = @LIB_RUNTIME_DIR@
    2727CFLAGS          = @CFLAGS@ -fPIC
     28TCL_SRC_DIR     = @TCL_SRC_DIR@
    2829TCL_VERSION     = @TCL_VERSION@
    29 TCLTK_SRCS      = -I../../../runtime/tcl8.4.19/generic -I../../../runtime/tk8.4.19/generic -I../../../runtime/tk8.4.19/unix
    3030TCL_LIB_SPEC    = @TCL_LIB_SPEC@
     31TK_SRC_DIR      = @TK_SRC_DIR@
    3132TK_LIB_SPEC     = @TK_LIB_SPEC@
    32 TK_XLIBSW       = @TK_XLIBSW@
     33TK_XLIBSW       = @TK_XLIBSW@
     34# FIXME: should be using TK_INCLUDES from TEA_PRIVATE_TK_HEADERS
     35TCLTK_INCLUDES  = -I$(TCL_SRC_DIR)/generic -I$(TK_SRC_DIR)/generic -I$(TK_SRC_DIR)/unix
    3336VTK_VERSION     = @VTK_VERSION@
    3437VTK_TCL_DIR     = @VTK_TCL_DIR@
     
    9598
    9699RpListbox.o: RpListbox.c
    97         $(CC) $(CC_SWITCHES) $(TCLTK_SRCS) -c $?
     100        $(CC) $(CC_SWITCHES) $(TCLTK_INCLUDES) -c $?
    98101.cc.o:
    99102        $(CXX) $(CXX_SWITCHES) -c $?
  • branches/blt4_trunk/gui/src/RpSqueezer.c

    r5673 r6136  
    199199        }
    200200    }
    201     Tk_PhotoSetSize(destPhoto, destw, srch);
    202     Tk_PhotoPutBlock(destPhoto, &destBlock, 0, 0,
     201    Tk_PhotoSetSize(NULL, destPhoto, destw, srch);
     202    Tk_PhotoPutBlock(NULL, destPhoto, &destBlock, 0, 0,
    203203        destBlock.width, destBlock.height, TK_PHOTO_COMPOSITE_SET);
    204204
Note: See TracChangeset for help on using the changeset viewer.