rpms/tcldebugger/devel tcldebugger-1.4-destdir.patch, NONE, 1.1 tcldebugger-1.4-shebang.patch, NONE, 1.1 tcldebugger-1.4-shortsplash.patch, NONE, 1.1 tcldebugger-1.4-tclm4.patch, NONE, 1.1 tcldebugger-1.4-tkupdate.patch, NONE, 1.1 tcldebugger.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Michael Thomas (wart)
fedora-extras-commits at redhat.com
Sat Nov 25 23:36:30 UTC 2006
Author: wart
Update of /cvs/extras/rpms/tcldebugger/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16307/devel
Modified Files:
.cvsignore sources
Added Files:
tcldebugger-1.4-destdir.patch tcldebugger-1.4-shebang.patch
tcldebugger-1.4-shortsplash.patch tcldebugger-1.4-tclm4.patch
tcldebugger-1.4-tkupdate.patch tcldebugger.spec
Log Message:
auto-import tcldebugger-1.4-1.20061030cvs on branch devel from tcldebugger-1.4-1.20061030cvs.src.rpm
tcldebugger-1.4-destdir.patch:
--- NEW FILE tcldebugger-1.4-destdir.patch ---
--- Makefile.in.orig 2006-11-01 10:59:45.000000000 -0800
+++ Makefile.in 2006-11-01 11:39:49.000000000 -0800
@@ -184,12 +184,13 @@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
+datadir = @datadir@
oldincludedir = /usr/include
DESTDIR =
pkgdatadir = $(exec_prefix)/bin/
-pkglibdir = $(prefix)/lib/@PACKAGE@@VERSION@
+pkglibdir = $(datadir)/tcldebugger at VERSION@
imagelibdir = $(pkglibdir)/images
top_builddir = .
@@ -309,23 +310,23 @@
#========================================================================
install-libraries: libraries installdirs
- @echo "Installing Tcl files in $(pkglibdir)"
+ @echo "Installing Tcl files in $(DESTDIR)$(pkglibdir)"
@for i in $(LIB_FILES) ; do \
- $(INSTALL_SCRIPT) $$i $(pkglibdir) ; \
+ $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkglibdir) ; \
done;
- @$(INSTALL_SCRIPT) $(DEBUG_NUB_SCRIPT) $(pkglibdir)
- @$(INSTALL_SCRIPT) pkgIndex.tcl $(pkglibdir)
- @echo "Installing PDX files in $(pkglibdir)"
+ @$(INSTALL_SCRIPT) $(DEBUG_NUB_SCRIPT) $(DESTDIR)$(pkglibdir)
+ @$(INSTALL_SCRIPT) pkgIndex.tcl $(DESTDIR)$(pkglibdir)
+ @echo "Installing PDX files in $(DESTDIR)$(pkglibdir)"
@for i in $(DEBUG_PDX_FILES) ; do \
- $(INSTALL_SCRIPT) $$i $(pkglibdir) ; \
+ $(INSTALL_SCRIPT) $$i $(DESTDIR)$(pkglibdir) ; \
done;
- @echo "Installing Image files in $(imagelibdir)"
+ @echo "Installing Image files in $(DESTDIR)$(imagelibdir)"
@for i in $(srcdir)/images/*.gif ; do \
- $(INSTALL_DATA) $$i $(imagelibdir) ; \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(imagelibdir) ; \
done;
- @echo "Installing support scripts in $(bindir)"
- @$(INSTALL_SCRIPT) $(DEBUG_LAUNCH_SCRIPT) $(bindir)
- @$(INSTALL_SCRIPT) $(DEBUG_INIT_SCRIPT) $(bindir)
+ @echo "Installing support scripts in $(DESTDIR)$(bindir)"
+ @$(INSTALL_SCRIPT) $(DEBUG_LAUNCH_SCRIPT) $(DESTDIR)$(bindir)
+ @$(INSTALL_SCRIPT) $(DEBUG_INIT_SCRIPT) $(DESTDIR)$(bindir)
#========================================================================
# Install documentation. Unix manpages should go in the $(mandir)
@@ -333,7 +334,7 @@
#========================================================================
install-doc: doc installdirs
- $(INSTALL_DATA) $(srcdir)/docs/initdebug.n $(mandir)/mann
+ $(INSTALL_DATA) $(srcdir)/docs/initdebug.n $(DESTDIR)$(mandir)/mann
test: $(TCLSH_PROG)
TCL_LIBRARY=$(TCL_LIBRARY_DIR) \
@@ -611,6 +612,7 @@
done
installdirs:
+ @$(mkinstalldirs) $(DESTDIR)$(bindir)
@$(mkinstalldirs) $(DESTDIR)$(libdir)
@$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
@$(mkinstalldirs) $(DESTDIR)$(imagelibdir)
tcldebugger-1.4-shebang.patch:
--- NEW FILE tcldebugger-1.4-shebang.patch ---
--- appLaunch.tcl.orig 2006-11-01 21:45:06.000000000 -0800
+++ appLaunch.tcl 2006-11-01 21:45:48.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec tclsh "$0" ${1+"$@"}
+
# appLaunch.tcl --
#
# This script takes care of initializing the nub and invoking the
--- initdebug.tcl.orig 2006-11-01 21:45:11.000000000 -0800
+++ initdebug.tcl 2006-11-01 21:45:50.000000000 -0800
@@ -1,3 +1,7 @@
+#!/bin/sh
+# \
+exec tclsh "$0" ${1+"$@"}
+
# initdebug.tcl --
#
# This file contains the public routines used to start debugging user
tcldebugger-1.4-shortsplash.patch:
--- NEW FILE tcldebugger-1.4-shortsplash.patch ---
--- debugger.tcl.in.orig 2006-11-01 16:03:09.000000000 -0800
+++ debugger.tcl.in 2006-11-01 16:03:18.000000000 -0800
@@ -240,7 +240,7 @@
# Display the splash screen and set a timer to remove it.
set about [gui::showAboutWindow]
- after 2500 [list destroy $about]
+ after 500 [list destroy $about]
# Remove the send command. This will keep other applications
# from being able to poke into our interp via the send command.
tcldebugger-1.4-tclm4.patch:
--- NEW FILE tcldebugger-1.4-tclm4.patch ---
--- config/tcl.m4.orig 2006-11-01 10:45:21.000000000 -0800
+++ config/tcl.m4 2006-11-01 10:45:06.000000000 -0800
@@ -68,7 +68,10 @@
# check in a few common install locations
if test x"${ac_cv_c_tclconfig}" = x ; then
- for i in `ls -d ${prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ `ls -d ${prefix}/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` ; do
if test -f "$i/tclConfig.sh" ; then
@@ -161,7 +164,10 @@
fi
# check in a few common install locations
if test x"${ac_cv_c_tkconfig}" = x ; then
- for i in `ls -d ${prefix}/lib 2>/dev/null` \
+ for i in `ls -d ${libdir} 2>/dev/null` \
+ `ls -d ${exec_prefix}/lib 2>/dev/null` \
+ `ls -d ${prefix}/lib 2>/dev/null` \
+ `ls -d /usr/lib64 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/local/lib 2>/dev/null` ; do
if test -f "$i/tkConfig.sh" ; then
@@ -588,7 +594,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+ system=MP-RAS-`awk '{print $3}' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
@@ -1580,7 +1586,7 @@
# results, and the version is kept in special file).
if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
- system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+ system=MP-RAS-`awk '{print $3}' /etc/.relid`
fi
if test "`uname -s`" = "AIX" ; then
system=AIX-`uname -v`.`uname -r`
tcldebugger-1.4-tkupdate.patch:
--- NEW FILE tcldebugger-1.4-tkupdate.patch ---
Index: bindings.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/bindings.tcl,v
retrieving revision 1.5
diff -u -r1.5 bindings.tcl
--- bindings.tcl 31 Oct 2000 23:30:57 -0000 1.5
+++ bindings.tcl 1 Nov 2006 22:41:29 -0000
@@ -157,124 +157,124 @@
}
bind noEdit <B1-Leave> {
- set tkPriv(x) %x
- set tkPriv(y) %y
+ set tk::Priv(x) %x
+ set tk::Priv(y) %y
code::tkTextAutoScan $code::codeWin
break;
}
bind noEdit <B1-Enter> {
- tkCancelRepeat
+ tk::CancelRepeat
break
}
bind noEdit <ButtonRelease-1> {
- tkCancelRepeat
+ tk::CancelRepeat
break
}
bind noEdit <1> {
- tkTextButton1 %W %x %y
+ tk::TextButton1 %W %x %y
%W tag remove sel 0.0 end
}
bind noEdit <B1-Motion> {
- set tkPriv(x) %x
- set tkPriv(y) %y
- tkTextSelectTo %W %x %y
+ set tk::Priv(x) %x
+ set tk::Priv(y) %y
+ tk::TextSelectTo %W %x %y
}
bind noEdit <Double-1> {
- set tkPriv(selectMode) word
- tkTextSelectTo %W %x %y
+ set tk::Priv(selectMode) word
+ tk::TextSelectTo %W %x %y
catch {%W mark set insert sel.first}
}
bind noEdit <Triple-1> {
- set tkPriv(selectMode) line
- tkTextSelectTo %W %x %y
+ set tk::Priv(selectMode) line
+ tk::TextSelectTo %W %x %y
catch {%W mark set insert sel.first}
}
bind noEdit <Shift-1> {
- tkTextResetAnchor %W @%x,%y
- set tkPriv(selectMode) char
- tkTextSelectTo %W %x %y
+ tk::TextResetAnchor %W @%x,%y
+ set tk::Priv(selectMode) char
+ tk::TextSelectTo %W %x %y
}
bind noEdit <Double-Shift-1> {
- set tkPriv(selectMode) word
- tkTextSelectTo %W %x %y
+ set tk::Priv(selectMode) word
+ tk::TextSelectTo %W %x %y
}
bind noEdit <Triple-Shift-1> {
- set tkPriv(selectMode) line
- tkTextSelectTo %W %x %y
+ set tk::Priv(selectMode) line
+ tk::TextSelectTo %W %x %y
}
bind noEdit <B1-Leave> {
- set tkPriv(x) %x
- set tkPriv(y) %y
- tkTextAutoScan %W
+ set tk::Priv(x) %x
+ set tk::Priv(y) %y
+ tk::TextAutoScan %W
}
bind noEdit <B1-Enter> {
- tkCancelRepeat
+ tk::CancelRepeat
}
bind noEdit <ButtonRelease-1> {
- tkCancelRepeat
+ tk::CancelRepeat
}
bind noEdit <Control-1> {
%W mark set insert @%x,%y
}
bind noEdit <Left> {
- tkTextSetCursor %W insert-1c
+ tk::TextSetCursor %W insert-1c
}
bind noEdit <Right> {
- tkTextSetCursor %W insert+1c
+ tk::TextSetCursor %W insert+1c
}
bind noEdit <Up> {
- tkTextSetCursor %W [tkTextUpDownLine %W -1]
+ tk::TextSetCursor %W [tk::TextUpDownLine %W -1]
}
bind noEdit <Down> {
- tkTextSetCursor %W [tkTextUpDownLine %W 1]
+ tk::TextSetCursor %W [tk::TextUpDownLine %W 1]
}
bind noEdit <Shift-Left> {
- tkTextKeySelect %W [%W index {insert - 1c}]
+ tk::TextKeySelect %W [%W index {insert - 1c}]
}
bind noEdit <Shift-Right> {
- tkTextKeySelect %W [%W index {insert + 1c}]
+ tk::TextKeySelect %W [%W index {insert + 1c}]
}
bind noEdit <Shift-Up> {
- tkTextKeySelect %W [tkTextUpDownLine %W -1]
+ tk::TextKeySelect %W [tk::TextUpDownLine %W -1]
}
bind noEdit <Shift-Down> {
- tkTextKeySelect %W [tkTextUpDownLine %W 1]
+ tk::TextKeySelect %W [tk::TextUpDownLine %W 1]
}
bind noEdit <Control-Left> {
- tkTextSetCursor %W [tkTextPrevPos %W insert tcl_startOfPreviousWord]
+ tk::TextSetCursor %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
}
bind noEdit <Control-Right> {
- tkTextSetCursor %W [tkTextNextWord %W insert]
+ tk::TextSetCursor %W [tk::TextNextWord %W insert]
}
bind noEdit <Control-Up> {
- tkTextSetCursor %W [tkTextPrevPara %W insert]
+ tk::TextSetCursor %W [tk::TextPrevPara %W insert]
}
bind noEdit <Control-Down> {
- tkTextSetCursor %W [tkTextNextPara %W insert]
+ tk::TextSetCursor %W [tkTextNextPara %W insert]
}
bind noEdit <Shift-Control-Left> {
- tkTextKeySelect %W [tkTextPrevPos %W insert tcl_startOfPreviousWord]
+ tk::TextKeySelect %W [tk::TextPrevPos %W insert tcl_startOfPreviousWord]
}
bind noEdit <Shift-Control-Right> {
- tkTextKeySelect %W [tkTextNextWord %W insert]
+ tk::TextKeySelect %W [tk::TextNextWord %W insert]
}
bind noEdit <Shift-Control-Up> {
- tkTextKeySelect %W [tkTextPrevPara %W insert]
+ tk::TextKeySelect %W [tk::TextPrevPara %W insert]
}
bind noEdit <Shift-Control-Down> {
- tkTextKeySelect %W [tkTextNextPara %W insert]
+ tk::TextKeySelect %W [tkTextNextPara %W insert]
}
bind noEdit <Prior> {
- tkTextSetCursor %W [tkTextScrollPages %W -1]
+ tk::TextSetCursor %W [tk::TextScrollPages %W -1]
}
bind noEdit <Shift-Prior> {
- tkTextKeySelect %W [tkTextScrollPages %W -1]
+ tk::TextKeySelect %W [tk::TextScrollPages %W -1]
}
bind noEdit <Next> {
- tkTextSetCursor %W [tkTextScrollPages %W 1]
+ tk::TextSetCursor %W [tk::TextScrollPages %W 1]
}
bind noEdit <Shift-Next> {
- tkTextKeySelect %W [tkTextScrollPages %W 1]
+ tk::TextKeySelect %W [tk::TextScrollPages %W 1]
}
bind noEdit <Control-Prior> {
%W xview scroll -1 page
@@ -283,28 +283,28 @@
%W xview scroll 1 page
}
bind noEdit <Home> {
- tkTextSetCursor %W {insert linestart}
+ tk::TextSetCursor %W {insert linestart}
}
bind noEdit <Shift-Home> {
- tkTextKeySelect %W {insert linestart}
+ tk::TextKeySelect %W {insert linestart}
}
bind noEdit <End> {
- tkTextSetCursor %W {insert lineend}
+ tk::TextSetCursor %W {insert lineend}
}
bind noEdit <Shift-End> {
- tkTextKeySelect %W {insert lineend}
+ tk::TextKeySelect %W {insert lineend}
}
bind noEdit <Control-Home> {
- tkTextSetCursor %W 1.0
+ tk::TextSetCursor %W 1.0
}
bind noEdit <Control-Shift-Home> {
- tkTextKeySelect %W 1.0
+ tk::TextKeySelect %W 1.0
}
bind noEdit <Control-End> {
- tkTextSetCursor %W {end - 1 char}
+ tk::TextSetCursor %W {end - 1 char}
}
bind noEdit <Control-Shift-End> {
- tkTextKeySelect %W {end - 1 char}
+ tk::TextKeySelect %W {end - 1 char}
}
bind noEdit <Control-space> {
%W mark set anchor insert
@@ -313,12 +313,12 @@
%W mark set anchor insert
}
bind noEdit <Control-Shift-space> {
- set tkPriv(selectMode) char
- tkTextKeyExtend %W insert
+ set tk::Priv(selectMode) char
+ tk::TextKeyExtend %W insert
}
bind noEdit <Shift-Select> {
- set tkPriv(selectMode) char
- tkTextKeyExtend %W insert
+ set tk::Priv(selectMode) char
+ tk::TextKeyExtend %W insert
}
bind noEdit <Control-slash> {
%W tag add sel 1.0 end
Index: breakWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/breakWin.tcl,v
retrieving revision 1.3
diff -u -r1.3 breakWin.tcl
--- breakWin.tcl 31 Oct 2000 23:30:57 -0000 1.3
+++ breakWin.tcl 1 Nov 2006 22:41:30 -0000
@@ -109,9 +109,9 @@
-command {destroy $gui::gui(breakDbgWin)}]
pack $showBut $remBut $allBut $closeBut -fill x -padx $pad -pady 3
- grid $breakLbl -row 0 -col 0 -sticky nwe -columnspan 2 -padx 4
- grid $breakSubFrm -row 1 -col 0 -sticky nswe -padx $pad -pady $pad
- grid $butFrm -row 1 -col 1 -sticky ns
+ grid $breakLbl -row 0 -column 0 -sticky nwe -columnspan 2 -padx 4
+ grid $breakSubFrm -row 1 -column 0 -sticky nswe -padx $pad -pady $pad
+ grid $butFrm -row 1 -column 1 -sticky ns
grid columnconfigure $breakFrm 0 -weight 1
grid rowconfigure $breakFrm 1 -weight 1
Index: codeWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/codeWin.tcl,v
retrieving revision 1.8
diff -u -r1.8 codeWin.tcl
--- codeWin.tcl 17 Oct 2001 18:08:33 -0000 1.8
+++ codeWin.tcl 1 Nov 2006 22:41:31 -0000
@@ -569,24 +569,24 @@
# None.
proc code::tkTextAutoScan {w} {
- global tkPriv
+ global tk::Priv
if {![winfo exists $w]} return
- if {$tkPriv(y) >= [winfo height $w]} {
+ if {$tk::Priv(y) >= [winfo height $w]} {
$code::codeBar yview scroll 2 units
$code::lineBar yview scroll 2 units
$code::codeWin yview scroll 2 units
- } elseif {$tkPriv(y) < 0} {
+ } elseif {$tk::Priv(y) < 0} {
$code::codeBar yview scroll -2 units
$code::lineBar yview scroll -2 units
$code::codeWin yview scroll -2 units
- } elseif {$tkPriv(x) >= [winfo width $w]} {
+ } elseif {$tk::Priv(x) >= [winfo width $w]} {
$code::codeWin xview scroll 2 units
- } elseif {$tkPriv(x) < 0} {
+ } elseif {$tk::Priv(x) < 0} {
$code::codeWin xview scroll -2 units
} else {
return
}
- set tkPriv(afterId) [after 50 code::tkTextAutoScan $w]
+ set tk::Priv(afterId) [after 50 code::tkTextAutoScan $w]
}
# code::toggleLBP --
Index: coverage.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/coverage.tcl,v
retrieving revision 1.6
diff -u -r1.6 coverage.tcl
--- coverage.tcl 31 Oct 2000 23:30:57 -0000 1.6
+++ coverage.tcl 1 Nov 2006 22:41:33 -0000
@@ -246,11 +246,11 @@
pack $clearAllBut -fill x
pack $closeBut -fill x -anchor s
- grid $radio(uncvr) -row 1 -col 0 -sticky nw -columnspan 3
- grid $radio(cvr) -row 2 -col 0 -sticky nw -columnspan 3
- grid $coverText -row 3 -col 0 -sticky nswe -padx $pad -pady $pad \
+ grid $radio(uncvr) -row 1 -column 0 -sticky nw -columnspan 3
+ grid $radio(cvr) -row 2 -column 0 -sticky nw -columnspan 3
+ grid $coverText -row 3 -column 0 -sticky nswe -padx $pad -pady $pad \
-columnspan 2
- grid $butFrm -row 3 -col 2 -sticky nwe -padx $pad -pady $pad
+ grid $butFrm -row 3 -column 2 -sticky nwe -padx $pad -pady $pad
grid columnconfigure $mainFrm 1 -weight 1
grid rowconfigure $mainFrm 3 -weight 1
Index: find.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/find.tcl,v
retrieving revision 1.3
diff -u -r1.3 find.tcl
--- find.tcl 31 Oct 2000 23:30:58 -0000 1.3
+++ find.tcl 1 Nov 2006 22:41:33 -0000
@@ -160,11 +160,11 @@
set closeBut [button $mainFrm.closeBut -text "Close" -default normal \
-command {destroy $gui::gui(findDbgWin)}]
- grid $findFrm -row 0 -col 0 -sticky nwe -columnspan 2 -padx $pad
- grid $findBut -row 0 -col 2 -sticky nwe -padx $pad -pady $pad
- grid $closeBut -row 1 -col 2 -sticky nwe -padx $pad -pady $pad
- grid $checkFrm -row 1 -col 0 -sticky nsw
- grid $dirFrm -row 1 -col 1 -sticky nswe -padx $pad -pady $pad
+ grid $findFrm -row 0 -column 0 -sticky nwe -columnspan 2 -padx $pad
+ grid $findBut -row 0 -column 2 -sticky nwe -padx $pad -pady $pad
+ grid $closeBut -row 1 -column 2 -sticky nwe -padx $pad -pady $pad
+ grid $checkFrm -row 1 -column 0 -sticky nsw
+ grid $dirFrm -row 1 -column 1 -sticky nswe -padx $pad -pady $pad
grid columnconfigure $mainFrm 1 -weight 1
grid rowconfigure $mainFrm 2 -weight 1
pack $mainFrm -fill both -expand true -padx $pad -pady $pad
@@ -594,15 +594,15 @@
set closeBut [button $placeFrm.closeBut -text Close -default normal\
-command {destroy $gui::gui(gotoDbgWin)} -width 10]
- grid $gotoBut -row 0 -col 0 -sticky w -padx $pad
- grid $closeBut -row 0 -col 1 -sticky w -padx $pad
+ grid $gotoBut -row 0 -column 0 -sticky w -padx $pad
+ grid $closeBut -row 0 -column 1 -sticky w -padx $pad
grid rowconfigure $placeFrm 0 -weight 1
- grid $choiceLbl -row 0 -col 0 -sticky nw -padx $pad -pady $pad
- grid $lineLbl -row 0 -col 1 -sticky nw -pady $pad
- grid $choiceBox -row 1 -col 0 -sticky w -padx $pad
- grid $lineEnt -row 1 -col 1 -sticky we
- grid $placeFrm -row 2 -col 0 -columnspan 2 -padx $pad -pady $pad
+ grid $choiceLbl -row 0 -column 0 -sticky nw -padx $pad -pady $pad
+ grid $lineLbl -row 0 -column 1 -sticky nw -pady $pad
+ grid $choiceBox -row 1 -column 0 -sticky w -padx $pad
+ grid $lineEnt -row 1 -column 1 -sticky we
+ grid $placeFrm -row 2 -column 0 -columnspan 2 -padx $pad -pady $pad
grid columnconfigure $mainFrm 1 -weight 1
grid rowconfigure $mainFrm 2 -weight 1
pack $mainFrm -fill both -expand true -padx $pad -pady $pad
Index: gui.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/gui.tcl,v
retrieving revision 1.15
diff -u -r1.15 gui.tcl
--- gui.tcl 17 Oct 2001 18:08:33 -0000 1.15
+++ gui.tcl 1 Nov 2006 22:41:33 -0000
@@ -1875,8 +1875,8 @@
pack $infoText -side left -fill x -expand 1
pack $fillFrm -side left -fill x
- grid $instLbl -row 0 -col 0 -sticky we
- grid $fileText -row 0 -col 1 -sticky we -padx 2
+ grid $instLbl -row 0 -column 0 -sticky we
+ grid $fileText -row 0 -column 1 -sticky we -padx 2
grid columnconfigure $fileFrm 1 -weight 1
grid columnconfigure $fileFrm 0 -minsize $width
@@ -2595,16 +2595,16 @@
grid $m.title -columnspan 2 -pady 10
#grid $m.t -columnspan 2
- grid $m.l1 -row 1 -col 0 -sticky e
- grid $m.r1 -row 1 -col 1 -sticky w
- grid $m.l2 -row 2 -col 0 -sticky e
- grid $m.r2 -row 2 -col 1 -sticky w
- grid $m.l3 -row 3 -col 0 -sticky e
- grid $m.r3 -row 3 -col 1 -sticky w
- grid $m.l4 -row 4 -col 0 -sticky e
- grid $m.r4 -row 4 -col 1 -sticky w
- grid $m.l5 -row 5 -col 0 -sticky e
- grid $m.r5 -row 5 -col 1 -sticky w
+ grid $m.l1 -row 1 -column 0 -sticky e
+ grid $m.r1 -row 1 -column 1 -sticky w
+ grid $m.l2 -row 2 -column 0 -sticky e
+ grid $m.r2 -row 2 -column 1 -sticky w
+ grid $m.l3 -row 3 -column 0 -sticky e
+ grid $m.r3 -row 3 -column 1 -sticky w
+ grid $m.l4 -row 4 -column 0 -sticky e
+ grid $m.r4 -row 4 -column 1 -sticky w
+ grid $m.l5 -row 5 -column 0 -sticky e
+ grid $m.r5 -row 5 -column 1 -sticky w
grid $m.b -columnspan 2 -pady 10
}
Index: inspectorWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/inspectorWin.tcl,v
retrieving revision 1.4
diff -u -r1.4 inspectorWin.tcl
--- inspectorWin.tcl 31 Oct 2000 23:30:58 -0000 1.4
+++ inspectorWin.tcl 1 Nov 2006 22:41:34 -0000
@@ -226,9 +226,9 @@
set yscroll [scrollbar $varFrm.yscroll -command [list $varText yview]]
set xscroll [scrollbar $varFrm.xscroll -command [list $varText xview] \
-orient horizontal]
- grid $varText -row 0 -col 0 -sticky nswe
- grid $yscroll -row 0 -col 1 -sticky ns
- grid $xscroll -row 1 -col 0 -sticky we
+ grid $varText -row 0 -column 0 -sticky nswe
+ grid $yscroll -row 0 -column 1 -sticky ns
+ grid $xscroll -row 1 -column 0 -sticky we
grid columnconfigure $varFrm 0 -weight 1
grid rowconfigure $varFrm 0 -weight 1
Index: menu.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/menu.tcl,v
retrieving revision 1.15
diff -u -r1.15 menu.tcl
--- menu.tcl 31 Oct 2000 23:30:59 -0000 1.15
+++ menu.tcl 1 Nov 2006 22:41:34 -0000
@@ -929,11 +929,11 @@
pack $selectText -side left -fill both -expand true
pack $showBut $canBut -fill x
pack $canBut -pady $pad -fill x
- grid $selectLbl -row 0 -col 0 -padx $pad -sticky nw
- grid $selectFrm -row 1 -col 0 -padx $pad -pady $pad -sticky nswe \
+ grid $selectLbl -row 0 -column 0 -padx $pad -sticky nw
+ grid $selectFrm -row 1 -column 0 -padx $pad -pady $pad -sticky nswe \
-rowspan 2
- grid $butFrm -row 1 -col 1 -padx $pad -pady $pad -sticky nwe
- grid $instLbl -row 3 -col 0 -padx $pad -sticky nw -columnspan 2
+ grid $butFrm -row 1 -column 1 -padx $pad -pady $pad -sticky nwe
+ grid $instLbl -row 3 -column 0 -padx $pad -sticky nw -columnspan 2
grid columnconfigure $mainFrm 0 -weight 1
grid rowconfigure $mainFrm 1 -weight 1
pack $mainFrm -fill both -expand true -padx $pad -pady $pad
Index: portWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/portWin.tcl,v
retrieving revision 1.5
diff -u -r1.5 portWin.tcl
--- portWin.tcl 31 Oct 2000 23:31:00 -0000 1.5
+++ portWin.tcl 1 Nov 2006 22:41:34 -0000
@@ -97,9 +97,9 @@
pack $portEnt -side right
pack $portLabel -side right
- grid $imageLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
- grid $msgLbl -row 0 -col 1 -sticky w -padx $pad -pady $pad
- grid $portFrm -row 2 -col 1 -sticky w -padx $pad -pady $pad
+ grid $imageLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+ grid $msgLbl -row 0 -column 1 -sticky w -padx $pad -pady $pad
+ grid $portFrm -row 2 -column 1 -sticky w -padx $pad -pady $pad
grid columnconfigure $mainFrm 1 -weight 1
grid rowconfigure $mainFrm 1 -weight 1
Index: prefWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/prefWin.tcl,v
retrieving revision 1.4
diff -u -r1.4 prefWin.tcl
--- prefWin.tcl 31 Oct 2000 23:31:00 -0000 1.4
+++ prefWin.tcl 1 Nov 2006 22:41:35 -0000
@@ -321,10 +321,10 @@
-listwidth 6 -listheight 1 \
-textvariable [pref::prefVar fontSize TempPref]]
- grid $typeLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
- grid $typeBox -row 0 -col 1 -sticky we -pady $pad
- grid $sizeLbl -row 0 -col 3 -sticky w -padx $pad -pady $pad
- grid $sizeBox -row 0 -col 4 -sticky we -pady $pad
+ grid $typeLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+ grid $typeBox -row 0 -column 1 -sticky we -pady $pad
+ grid $sizeLbl -row 0 -column 3 -sticky w -padx $pad -pady $pad
+ grid $sizeBox -row 0 -column 4 -sticky we -pady $pad
grid columnconfigure $subFrm 1 -weight 1
grid columnconfigure $subFrm 2 -minsize 20
grid columnconfigure $subFrm 5 -weight 1
@@ -385,12 +385,12 @@
pack propagate $cmdresultFrm 0
pack $cmdresultBut -fill both
- grid $highLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
- grid $highFrm -row 0 -col 1 -sticky w -pady $pad
- grid $errorLbl -row 0 -col 3 -sticky w -padx $pad -pady $pad
- grid $errorFrm -row 0 -col 4 -sticky w -pady $pad
- grid $cmdresultLbl -row 0 -col 6 -sticky w -padx $pad -pady $pad
- grid $cmdresultFrm -row 0 -col 7 -sticky w -pady $pad
+ grid $highLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+ grid $highFrm -row 0 -column 1 -sticky w -pady $pad
+ grid $errorLbl -row 0 -column 3 -sticky w -padx $pad -pady $pad
+ grid $errorFrm -row 0 -column 4 -sticky w -pady $pad
+ grid $cmdresultLbl -row 0 -column 6 -sticky w -padx $pad -pady $pad
+ grid $cmdresultFrm -row 0 -column 7 -sticky w -pady $pad
grid columnconfigure $subFrm 2 -minsize 20
grid columnconfigure $subFrm 5 -minsize 20
grid columnconfigure $subFrm 8 -weight 1
@@ -456,10 +456,10 @@
set histryEnt [entry $subFrm.histryEnt -justify right -width 6 \
-textvariable [pref::prefVar historySize TempPref]]
- grid $screenLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
- grid $screenEnt -row 0 -col 1 -sticky w -pady $pad
- grid $histryLbl -row 0 -col 3 -sticky w -padx $pad -pady $pad
- grid $histryEnt -row 0 -col 4 -sticky w -pady $pad
+ grid $screenLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+ grid $screenEnt -row 0 -column 1 -sticky w -pady $pad
+ grid $histryLbl -row 0 -column 3 -sticky w -padx $pad -pady $pad
+ grid $histryEnt -row 0 -column 4 -sticky w -pady $pad
grid columnconfigure $subFrm 2 -minsize 20
grid columnconfigure $subFrm 5 -weight 1
@@ -490,8 +490,8 @@
set tabEnt [entry $subFrm.screenEnt -justify right -width 6 \
-textvariable [pref::prefVar tabSize TempPref]]
- grid $tabLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
- grid $tabEnt -row 0 -col 1 -sticky w -pady $pad
+ grid $tabLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+ grid $tabEnt -row 0 -column 1 -sticky w -pady $pad
grid columnconfigure $subFrm 3 -weight 1
pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -510,7 +510,7 @@
set reloadChk [checkbutton $subFrm.reloadChk \
-text "Reload the previous project on startup." \
-variable [pref::prefVar projectReload TempPref]]
- grid $reloadChk -row 0 -col 0 -sticky w -padx $pad
+ grid $reloadChk -row 0 -column 0 -sticky w -padx $pad
grid columnconfigure $subFrm 1 -weight 1
pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -542,10 +542,10 @@
-text "Warn before killing the application." \
-variable [pref::prefVar warnOnKill TempPref]]
- grid $askRad -row 0 -col 0 -sticky w -padx $pad
- grid $killRad -row 1 -col 0 -sticky w -padx $pad
- grid $runRad -row 2 -col 0 -sticky w -padx $pad
- grid $warnChk -row 0 -col 2 -sticky w -padx $pad
+ grid $askRad -row 0 -column 0 -sticky w -padx $pad
+ grid $killRad -row 1 -column 0 -sticky w -padx $pad
+ grid $runRad -row 2 -column 0 -sticky w -padx $pad
+ grid $warnChk -row 0 -column 2 -sticky w -padx $pad
grid columnconfigure $subFrm 1 -minsize 20
grid columnconfigure $subFrm 3 -weight 1
@@ -579,7 +579,7 @@
set mvBpChk [checkbutton $subFrm.mvBpChk \
-text "Warn when moving invalid breakpoints." \
-variable [pref::prefVar warnInvalidBp TempPref]]
- grid $mvBpChk -row 0 -col 0 -sticky w -padx $pad
+ grid $mvBpChk -row 0 -column 0 -sticky w -padx $pad
grid columnconfigure $subFrm 1 -weight 1
pack $subFrm -fill both -expand true -padx $pad -pady $pad2
Index: procWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/procWin.tcl,v
retrieving revision 1.5
diff -u -r1.5 procWin.tcl
--- procWin.tcl 31 Oct 2000 23:31:00 -0000 1.5
+++ procWin.tcl 1 Nov 2006 22:41:35 -0000
@@ -131,15 +131,15 @@
-command {destroy $gui::gui(procDbgWin)}]
pack $showBut $instruBut $uninstruBut $closeBut -fill x -pady 3
- grid $patLbl -row 0 -col 0 -sticky we -pady $pad
- grid $patEnt -row 0 -col 1 -sticky we -padx $pad -pady $pad
- grid $patBut -row 0 -col 2 -sticky we -padx $pad -pady $pad
- grid $sepFrm -row 1 -col 0 -sticky we -padx $pad -pady 3 -columnspan 3
- grid $showChk -row 2 -col 0 -sticky nw -columnspan 3
- grid $procText -row 3 -col 0 -sticky nswe -padx $pad -pady $pad \
+ grid $patLbl -row 0 -column 0 -sticky we -pady $pad
+ grid $patEnt -row 0 -column 1 -sticky we -padx $pad -pady $pad
+ grid $patBut -row 0 -column 2 -sticky we -padx $pad -pady $pad
+ grid $sepFrm -row 1 -column 0 -sticky we -padx $pad -pady 3 -columnspan 3
+ grid $showChk -row 2 -column 0 -sticky nw -columnspan 3
+ grid $procText -row 3 -column 0 -sticky nswe -padx $pad -pady $pad \
-columnspan 2
- grid $butFrm -row 3 -col 2 -sticky nwe -padx $pad -pady $pad
- grid $instLbl -row 4 -col 0 -sticky nw -padx $pad -columnspan 3
+ grid $butFrm -row 3 -column 2 -sticky nwe -padx $pad -pady $pad
+ grid $instLbl -row 4 -column 0 -sticky nw -padx $pad -columnspan 3
grid columnconfigure $mainFrm 1 -weight 1
grid rowconfigure $mainFrm 3 -weight 1
Index: projWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/projWin.tcl,v
retrieving revision 1.5
diff -u -r1.5 projWin.tcl
--- projWin.tcl 31 Oct 2000 23:31:00 -0000 1.5
+++ projWin.tcl 1 Nov 2006 22:41:36 -0000
@@ -562,8 +562,8 @@
set portEnt [entry $remoteFrm.screenEnt -justify right -width 6 \
-textvariable [pref::prefVar portRemote TempProj]]
- grid $localRad -row 0 -col 0 -sticky w -padx $pad
- grid $remoteRad -row 0 -col 1 -sticky w -padx $pad
+ grid $localRad -row 0 -column 0 -sticky w -padx $pad
+ grid $remoteRad -row 0 -column 1 -sticky w -padx $pad
grid columnconfigure $appFrm 1 -weight 1 -minsize 20
grid columnconfigure $appFrm 2 -weight 1 -minsize 20
@@ -585,8 +585,8 @@
grid configure $interpCombo -sticky nwe
grid columnconfigure $localFrm 0 -weight 1
- grid $portLbl -row 0 -col 0 -sticky w -padx $pad -pady $pad
- grid $portEnt -row 0 -col 1 -sticky w -pady $pad
+ grid $portLbl -row 0 -column 0 -sticky w -padx $pad -pady $pad
+ grid $portEnt -row 0 -column 1 -sticky w -pady $pad
grid columnconfigure $remoteFrm 3 -weight 1
pack $appFrm -fill x -expand true -padx $pad -pady $pad2
@@ -688,9 +688,9 @@
-variable [pref::prefVar errorAction TempProj] \
-value 0]
- grid $errRad1 -row 0 -col 0 -sticky w -padx $pad
- grid $errRad2 -row 1 -col 0 -sticky w -padx $pad
- grid $errRad3 -row 2 -col 0 -sticky w -padx $pad
+ grid $errRad1 -row 0 -column 0 -sticky w -padx $pad
+ grid $errRad2 -row 1 -column 0 -sticky w -padx $pad
+ grid $errRad3 -row 2 -column 0 -sticky w -padx $pad
grid columnconfigure $subFrm 0 -weight 1
pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -761,17 +761,17 @@
pack $instLbl -side left -anchor nw
pack $instEnt -side left -anchor ne -fill x -expand true
- grid $entFrm -row 0 -col 0 -columnspan 3 -sticky new -padx $pad -pady $pad
+ grid $entFrm -row 0 -column 0 -columnspan 3 -sticky new -padx $pad -pady $pad
- grid $instDoLbl -row 1 -col 0 -columnspan 3 -sticky nsw -padx $pad
- grid $doInstText -row 2 -col 0 -sticky nswe
- grid $sbDoInst -row 2 -col 1 -sticky nsw
- grid $doButFrm -row 2 -col 2 -sticky new -padx $pad
+ grid $instDoLbl -row 1 -column 0 -columnspan 3 -sticky nsw -padx $pad
+ grid $doInstText -row 2 -column 0 -sticky nswe
+ grid $sbDoInst -row 2 -column 1 -sticky nsw
+ grid $doButFrm -row 2 -column 2 -sticky new -padx $pad
- grid $instNoLbl -row 3 -col 0 -columnspan 3 -sticky nsw -padx $pad
- grid $noInstText -row 4 -col 0 -sticky nswe
- grid $sbNoInst -row 4 -col 1 -sticky nsw
- grid $noButFrm -row 4 -col 2 -sticky new -padx $pad
+ grid $instNoLbl -row 3 -column 0 -columnspan 3 -sticky nsw -padx $pad
+ grid $noInstText -row 4 -column 0 -sticky nswe
+ grid $sbNoInst -row 4 -column 1 -sticky nsw
+ grid $noButFrm -row 4 -column 2 -sticky new -padx $pad
grid columnconfigure $subFrm 0 -weight 1 -minsize $pad
grid rowconfigure $subFrm [list 2 4] -weight 1 -minsize $pad
@@ -872,11 +872,11 @@
-text "Instrument Expect." \
-variable [pref::prefVar instrumentExpect]]
- grid $dynChk -row 0 -col 0 -sticky w -padx $pad
- grid $autoChk -row 1 -col 0 -sticky w -padx $pad
- grid $incrChk -row 0 -col 1 -sticky w -padx $pad
- grid $tclxChk -row 1 -col 1 -sticky w -padx $pad
- grid $expectChk -row 2 -col 1 -sticky w -padx $pad
+ grid $dynChk -row 0 -column 0 -sticky w -padx $pad
+ grid $autoChk -row 1 -column 0 -sticky w -padx $pad
+ grid $incrChk -row 0 -column 1 -sticky w -padx $pad
+ grid $tclxChk -row 1 -column 1 -sticky w -padx $pad
+ grid $expectChk -row 2 -column 1 -sticky w -padx $pad
grid columnconfigure $subFrm 1 -minsize 20
grid columnconfigure $subFrm 3 -weight 1
Index: selection.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/selection.tcl,v
retrieving revision 1.3
diff -u -r1.3 selection.tcl
--- selection.tcl 31 Oct 2000 23:31:01 -0000 1.3
+++ selection.tcl 1 Nov 2006 22:41:37 -0000
@@ -91,15 +91,15 @@
# or re-enters the text widget.
bind scrollText <B1-Leave> {
- set tkPriv(x) %x
- set tkPriv(y) %y
+ set tk::Priv(x) %x
+ set tk::Priv(y) %y
sel::tkTextAutoScan %W
}
bind scrollText <B1-Enter> {
- tkCancelRepeat
+ tk::CancelRepeat
}
bind scrollText <ButtonRelease-1> {
- tkCancelRepeat
+ tk::CancelRepeat
}
# selectFocus --
@@ -1052,7 +1052,7 @@
# This procedure is invoked when the mouse leaves a text window
# with button 1 down. It scrolls the window up, down, left, or right,
# depending on where the mouse is (this information was saved in
-# tkPriv(x) and tkPriv(y)), and reschedules itself as an "after"
+# tk::Priv(x) and tk::Priv(y)), and reschedules itself as an "after"
# command so that the window continues to scroll until the mouse
# moves back into the window or the mouse button is released.
#
@@ -1063,19 +1063,19 @@
# None.
proc sel::tkTextAutoScan {w} {
- global tkPriv
+ global tk::Priv
if {![winfo exists $w]} return
- if {$tkPriv(y) >= [winfo height $w]} {
+ if {$tk::Priv(y) >= [winfo height $w]} {
$w yview scroll 2 units
- } elseif {$tkPriv(y) < 0} {
+ } elseif {$tk::Priv(y) < 0} {
$w yview scroll -2 units
- } elseif {$tkPriv(x) >= [winfo width $w]} {
+ } elseif {$tk::Priv(x) >= [winfo width $w]} {
$w xview scroll 2 units
- } elseif {$tkPriv(x) < 0} {
+ } elseif {$tk::Priv(x) < 0} {
$w xview scroll -2 units
} else {
return
}
- set tkPriv(afterId) [after 50 sel::tkTextAutoScan $w]
+ set tk::Priv(afterId) [after 50 sel::tkTextAutoScan $w]
}
Index: system.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/system.tcl,v
retrieving revision 1.22
diff -u -r1.22 system.tcl
--- system.tcl 31 Oct 2000 23:31:01 -0000 1.22
+++ system.tcl 1 Nov 2006 22:41:37 -0000
@@ -1053,10 +1053,10 @@
-variable [pref::prefVar browserDefault] \
-command "system::checkBrowserWindowState $otherLbl $otherEnt"]
- grid $defaultRad -row 0 -col 0 -sticky w -padx $pad -columnspan 2
- grid $otherRad -row 1 -col 0 -sticky w -padx $pad -columnspan 2
- grid $otherLbl -row 2 -col 1 -sticky w -padx $pad
- grid $otherEnt -row 3 -col 1 -sticky we -padx $pad
+ grid $defaultRad -row 0 -column 0 -sticky w -padx $pad -columnspan 2
+ grid $otherRad -row 1 -column 0 -sticky w -padx $pad -columnspan 2
+ grid $otherLbl -row 2 -column 1 -sticky w -padx $pad
+ grid $otherEnt -row 3 -column 1 -sticky we -padx $pad
grid columnconfigure $subFrm 0 -minsize 40
grid columnconfigure $subFrm 1 -weight 1
pack $subFrm -fill both -expand true -padx $pad -pady $pad2
@@ -1072,8 +1072,8 @@
set browserBox [guiUtil::ComboBox $subFrm.browserBox \
-textvariable [pref::prefVar browserCmd TempPref]]
- grid $browserLbl -row 0 -col 0 -sticky w -padx $pad
- grid $browserBox -row 1 -col 0 -sticky we -padx $pad
+ grid $browserLbl -row 0 -column 0 -sticky w -padx $pad
+ grid $browserBox -row 1 -column 0 -sticky we -padx $pad
grid columnconfigure $subFrm 0 -weight 1
pack $subFrm -fill both -expand true -padx $pad -pady $pad2
Index: tkcon.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/tkcon.tcl,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 tkcon.tcl
--- tkcon.tcl 18 Sep 1999 01:13:34 -0000 1.1.1.1
+++ tkcon.tcl 1 Nov 2006 22:41:38 -0000
@@ -466,7 +466,7 @@
global tcl_platform tk_version
#-----------------------------------------------------------------------
- # Elements of tkPriv that are used in this file:
+ # Elements of tk::Priv that are used in this file:
#
# char - Character position on the line; kept in order
# to allow moving up or down past short lines while
@@ -572,9 +572,9 @@
}
bind TkConsole <Control-a> {
if {[%W compare {limit linestart} == {insert linestart}]} {
- tkTextSetCursor %W limit
+ tk::TextSetCursor %W limit
} else {
- tkTextSetCursor %W {insert linestart}
+ tk::TextSetCursor %W {insert linestart}
}
}
bind TkConsole <Control-d> {
@@ -597,14 +597,14 @@
}
bind TkConsole <<TkCon_Previous>> {
if {[%W compare {insert linestart} != {limit linestart}]} {
- tkTextSetCursor %W [tkTextUpDownLine %W -1]
+ tk::TextSetCursor %W [tk::TextUpDownLine %W -1]
} else {
tkCon::Event -1
}
}
bind TkConsole <<TkCon_Next>> {
if {[%W compare {insert linestart} != {end-1c linestart}]} {
- tkTextSetCursor %W [tkTextUpDownLine %W 1]
+ tk::TextSetCursor %W [tk::TextUpDownLine %W 1]
} else {
tkCon::Event 1
}
@@ -623,7 +623,7 @@
}
bind TkConsole <<TkCon_Transpose>> {
## Transpose current and previous chars
- if {[%W compare insert > "limit+1c"]} { tkTextTranspose %W }
+ if {[%W compare insert > "limit+1c"]} { tk::TextTranspose %W }
}
bind TkConsole <<TkCon_ClearLine>> {
## Clear command line (Unix shell staple)
@@ -641,10 +641,10 @@
tkCon::Insert %W $tkCon::TKCON(tmp)
%W see end
}
- catch {bind TkConsole <Key-Up> { tkTextScrollPages %W -1 }}
- catch {bind TkConsole <Key-Prior> { tkTextScrollPages %W -1 }}
- catch {bind TkConsole <Key-Down> { tkTextScrollPages %W 1 }}
- catch {bind TkConsole <Key-Next> { tkTextScrollPages %W 1 }}
+ catch {bind TkConsole <Key-Up> { tk::TextScrollPages %W -1 }}
+ catch {bind TkConsole <Key-Prior> { tk::TextScrollPages %W -1 }}
+ catch {bind TkConsole <Key-Down> { tk::TextScrollPages %W 1 }}
+ catch {bind TkConsole <Key-Next> { tk::TextScrollPages %W 1 }}
bind TkConsole <$TKCON(meta)-d> {
if {[%W compare insert >= limit]} {
%W delete insert {insert wordend}
@@ -662,7 +662,7 @@
}
bind TkConsole <ButtonRelease-2> {
if {
- (!$tkPriv(mouseMoved) || $tk_strictMotif) && \
+ (!$tk::Priv(mouseMoved) || $tk_strictMotif) && \
(![catch {selection get -displayof %W} tkCon::TKCON(tmp)] || \
![catch {selection get -displayof %W -type TEXT} tkCon::TKCON(tmp)]\
|| ![catch {selection get -displayof %W \
Index: varWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/varWin.tcl,v
retrieving revision 1.3
diff -u -r1.3 varWin.tcl
--- varWin.tcl 31 Oct 2000 23:31:01 -0000 1.3
+++ varWin.tcl 1 Nov 2006 22:41:38 -0000
@@ -51,7 +51,7 @@
pack $vbpFrm -side left -fill y
pack $vbpText -side left -fill both -expand true
pack $nameText -side left -fill both -expand true
- grid $valuText -sticky wnse -row 0 -col 0
+ grid $valuText -sticky wnse -row 0 -column 0
grid columnconfigure $valuFrm 0 -weight 1
grid rowconfigure $valuFrm 0 -weight 1
guiUtil::tableCreate $varFrm $nameFrm $valuFrm \
Index: watchWin.tcl
===================================================================
RCS file: /cvsroot/tclpro/tcldebugger/watchWin.tcl,v
retrieving revision 1.3
diff -u -r1.3 watchWin.tcl
--- watchWin.tcl 31 Oct 2000 23:31:01 -0000 1.3
+++ watchWin.tcl 1 Nov 2006 22:41:39 -0000
@@ -153,7 +153,7 @@
pack $vbpFrm -side left -fill y
pack $vbpText -side left -fill both -expand true
pack $nameText -side left -fill both -expand true
- grid $valuText -sticky wnse -row 0 -col 0
+ grid $valuText -sticky wnse -row 0 -column 0
grid columnconfigure $valuFrm 0 -weight 1
grid rowconfigure $valuFrm 0 -weight 1
guiUtil::tableCreate $varFrm $nameFrm $valuFrm \
@@ -173,11 +173,11 @@
-command {destroy $gui::gui(watchDbgWin)}]
pack $inspectBut $remBut $allBut $closeBut -fill x -pady 3
- grid $addFrm -row 0 -col 0 -sticky we -padx $pad -pady $pad
- grid $addBut -row 0 -col 1 -sticky we -padx $pad -pady $pad2
- grid $sepFrm -row 1 -col 0 -columnspan 2 -sticky we -padx $pad
- grid $varFrm -row 2 -col 0 -sticky nswe -padx $pad -pady $pad2
- grid $butFrm -row 2 -col 1 -sticky nwe -padx $pad -pady [expr {$pad2 - 3}]
+ grid $addFrm -row 0 -column 0 -sticky we -padx $pad -pady $pad
+ grid $addBut -row 0 -column 1 -sticky we -padx $pad -pady $pad2
+ grid $sepFrm -row 1 -column 0 -columnspan 2 -sticky we -padx $pad
+ grid $varFrm -row 2 -column 0 -sticky nswe -padx $pad -pady $pad2
+ grid $butFrm -row 2 -column 1 -sticky nwe -padx $pad -pady [expr {$pad2 - 3}]
grid columnconfigure $mainFrm 0 -weight 1
grid rowconfigure $mainFrm 2 -weight 1
pack $mainFrm -fill both -expand true -padx $pad -pady $pad
@@ -558,7 +558,7 @@
$vbpText configure -padx 2
$valuText configure -yscroll [list gui::scrollDbgText $valuText $sb \
- [list grid $sb -sticky nse -row 0 -col 1]]
+ [list grid $sb -sticky nse -row 0 -column 1]]
# Special bindings on the nameText widget; toggling
# VBPs on/off/enabled/disabled.
--- NEW FILE tcldebugger.spec ---
%define cvsdate 20061030
Summary: Tcl debugging library
Name: tcldebugger
Version: 1.4
Release: 1.%{cvsdate}cvs%{?dist}
License: BSD
Group: Development/Libraries
# cvs -d:pserver:anonymous at tclpro.cvs.sourceforge.net:/cvsroot/tclpro export -D 2006-10-30 -d tcldebugger-20061030cvs tcldebugger
# tar czf tcldebugger-20061030cvs.tgz ./tcldebugger-20061030cvs
Source0: tcldebugger-%{cvsdate}cvs.tgz
Patch0: tcldebugger-1.4-tclm4.patch
Patch1: tcldebugger-1.4-destdir.patch
Patch2: tcldebugger-1.4-tkupdate.patch
Patch3: tcldebugger-1.4-shortsplash.patch
Patch4: tcldebugger-1.4-shebang.patch
URL: http://tclpro.sourceforge.net/
BuildRequires: tcl-devel autoconf
Requires: tk tclparser tcllib tbcload
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
%description
A debugging library for Tcl. This is used by the graphical TclPro debugger.
%prep
%setup -q -n %{name}-%{cvsdate}cvs
%patch0 -p0
%patch1 -p0
%patch2 -p0
%patch3 -p0
%patch4 -p0
autoconf
%build
%configure
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# Fix a few file permissions for rpmlint
chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.tcl
chmod a-x $RPM_BUILD_ROOT%{_datadir}/%{name}%{version}/*.pdx
%check
# Disabling unit tests as they require tools that haven't been built yet.
#make test
%clean
rm -rf $RPM_BUILD_ROOT
%files
%doc ChangeLog license.terms
%defattr(-,root,root)
%{_bindir}/initdebug.tcl
%{_bindir}/appLaunch.tcl
%{_datadir}/%{name}%{version}
%{_mandir}/mann/*.gz
%changelog
* Tue Oct 31 2006 Wart <wart at kobold.org> 1.4-1.20061030cvs
- Initial package for Fedora
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tcldebugger/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 25 Nov 2006 23:35:12 -0000 1.1
+++ .cvsignore 25 Nov 2006 23:36:00 -0000 1.2
@@ -0,0 +1 @@
+tcldebugger-20061030cvs.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tcldebugger/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 25 Nov 2006 23:35:12 -0000 1.1
+++ sources 25 Nov 2006 23:36:00 -0000 1.2
@@ -0,0 +1 @@
+2e58832337b39db415a39b121de89707 tcldebugger-20061030cvs.tgz
More information about the scm-commits
mailing list