Changeset 6136
- Timestamp:
- Mar 17, 2016, 7:56:48 PM (8 years ago)
- Location:
- branches/blt4_trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/blt4_trunk/configure
r6129 r6136 630 630 TK_XLIBSW 631 631 TK_VERSION 632 TK_SRC_DIR 632 633 TK_LIB_SPEC 633 634 TK_INC_SPEC 634 635 TCL_VERSION 636 TCL_SRC_DIR 635 637 TCL_SHLIB_SUFFIX 636 638 TCL_SHLIB_LDFLAGS … … 7349 7351 done 7350 7352 7353 TK_VERSION="8.4" 7354 for 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 7362 done 7363 7351 7364 7352 7365 # Check whether --with-ffmpeg was given. … … 10137 10150 10138 10151 MAKE=${make_command} 10152 10153 10139 10154 10140 10155 -
branches/blt4_trunk/configure.in
r6129 r6136 151 151 if test -f "$tclconfig" ; then 152 152 . $tclconfig 153 break 154 fi 155 done 156 157 TK_VERSION="8.4" 158 for dir in \ 159 ${exec_prefix} \ 160 ${exec_prefix}/lib ; do 161 tkconfig="${dir}/tkConfig.sh" 162 if test -f "$tkconfig" ; then 163 . $tkconfig 153 164 break 154 165 fi … … 451 462 AC_SUBST(TCL_SHLIB_LDFLAGS) 452 463 AC_SUBST(TCL_SHLIB_SUFFIX) 464 AC_SUBST(TCL_SRC_DIR) 453 465 AC_SUBST(TCL_VERSION) 454 466 AC_SUBST(TK_INC_SPEC) 455 467 AC_SUBST(TK_LIB_SPEC) 468 AC_SUBST(TK_SRC_DIR) 456 469 AC_SUBST(TK_VERSION) 457 470 AC_SUBST(TK_XLIBSW) -
branches/blt4_trunk/gui/scripts/sidebarframe.tcl
r5659 r6136 29 29 option add *SidebarFrame.sashCursor sb_h_double_arrow 30 30 31 itk::usual BltScrollset { 32 #empty 33 } 34 itk::usual BltTkFrame { 35 #empty 36 } 37 38 31 39 itcl::class Rappture::SidebarFrame { 32 40 inherit itk::Widget … … 56 64 protected method _sash {op x} 57 65 protected method _fixLayout {args} 58 protected method TabIndex { which } 66 67 private method TabIndex { which } 59 68 60 69 private variable _dispatcher "" ;# dispatcher for !events … … 173 182 # 174 183 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 } 180 186 181 187 itk_component add controlbar { … … 207 213 blt::tabset $itk_component(controlbar).tabs \ 208 214 -highlightthickness 0 -tearoff 0 -side left \ 209 -bd 0 -gap 0 -tabborderwidth 1\210 -outerpad 1215 -bd 1 -gap 1 -outerborderwidth 0 \ 216 -outerpad 0 -justify center 211 217 } { 212 218 keep -background -cursor … … 214 220 rename -highlightbackground -controlbackground controlBackground \ 215 221 Background 216 rename - background-controlbackground controlBackground \222 rename -troughcolor -controlbackground controlBackground \ 217 223 Background 218 224 } … … 241 247 } 242 248 243 set f [$itk_component(area) contents]249 set f $itk_component(area) 244 250 set pname "panel[incr _counter]" 245 251 itk_component add $pname { … … 249 255 $itk_component(tabs) insert $pos $pname \ 250 256 -image $panel(-icon) -text "" -padx 0 -pady 0 \ 251 -command [itcl::code $this _toggleTab $pname]257 -command [itcl::code $this _toggleTab] 252 258 253 259 set _title2panel($panel(-title)) $pname … … 365 371 $_dispatcher event -idle !layout 366 372 } 367 set n [$itk_component(tabs) index -name $pname] 368 $itk_component(tabs) select $n 373 $itk_component(tabs) select $which 369 374 370 375 $itk_component(title) configure -text $_panels($pname-title) 371 376 372 set f [$itk_component(area) contents]377 set f $itk_component(area) 373 378 foreach w [pack slaves $f] { 374 379 pack forget $w … … 497 502 pop open 498 503 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} { 501 505 pop close 502 506 } else { -
branches/blt4_trunk/gui/src/Makefile.in
r4212 r6136 26 26 LIB_RUNTIME_DIR = @LIB_RUNTIME_DIR@ 27 27 CFLAGS = @CFLAGS@ -fPIC 28 TCL_SRC_DIR = @TCL_SRC_DIR@ 28 29 TCL_VERSION = @TCL_VERSION@ 29 TCLTK_SRCS = -I../../../runtime/tcl8.4.19/generic -I../../../runtime/tk8.4.19/generic -I../../../runtime/tk8.4.19/unix30 30 TCL_LIB_SPEC = @TCL_LIB_SPEC@ 31 TK_SRC_DIR = @TK_SRC_DIR@ 31 32 TK_LIB_SPEC = @TK_LIB_SPEC@ 32 TK_XLIBSW = @TK_XLIBSW@ 33 TK_XLIBSW = @TK_XLIBSW@ 34 # FIXME: should be using TK_INCLUDES from TEA_PRIVATE_TK_HEADERS 35 TCLTK_INCLUDES = -I$(TCL_SRC_DIR)/generic -I$(TK_SRC_DIR)/generic -I$(TK_SRC_DIR)/unix 33 36 VTK_VERSION = @VTK_VERSION@ 34 37 VTK_TCL_DIR = @VTK_TCL_DIR@ … … 95 98 96 99 RpListbox.o: RpListbox.c 97 $(CC) $(CC_SWITCHES) $(TCLTK_ SRCS) -c $?100 $(CC) $(CC_SWITCHES) $(TCLTK_INCLUDES) -c $? 98 101 .cc.o: 99 102 $(CXX) $(CXX_SWITCHES) -c $? -
branches/blt4_trunk/gui/src/RpSqueezer.c
r5673 r6136 199 199 } 200 200 } 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, 203 203 destBlock.width, destBlock.height, TK_PHOTO_COMPOSITE_SET); 204 204
Note: See TracChangeset
for help on using the changeset viewer.