Patches to various tcl related directories - 4/4

[Syd Polk <spolk at redhat dot com>]

libgui/ChangeLog:

2000-06-22  Mo DeJong  <mdejong@redhat.com>

	* library/tree.tcl: Remove use of watch
	command. Add check to see if toplevel
	exists to avoid error.

2000-06-22  Mo DeJong  <mdejong@redhat.com>

	* src/tkGraphCanvas.c (GetEdgeNodes): Fixed
	crash in ckfree caused by call to strdup that
	was later freed using ckfree.

2000-06-19  Syd Polk  <spolk@redhat.com>

	* configure.in: Use CYG_AC_PATH_ITCLCONFIG and CYG_AC_LOAD_ITCLCONFIG
	instead of using exising itclsh.
	* aclocal.m4: Regenerated with new ../config/acinclude.m4.
	* configure: Regenerate.
	* Makefile.in library/Makefile.in src/Makefile.in: Regenerate.

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/libgui/Makefile.in,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.in
112a113
 > TCL_BIN_DIR = @TCL_BIN_DIR@
151,152c152
< TODO acconfig.h acinclude.m4 aclocal.m4 config.h.in configure \
< configure.in
---
 > acconfig.h acinclude.m4 aclocal.m4 config.h.in configure configure.in
Index: configure.in
===================================================================
RCS file: /cvs/src/src/libgui/configure.in,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 configure.in
15,16d14
< AC_CHECK_PROG(ITCL_SH, itcl_sh, itcl_sh,
< 	[\$\$here/\$(top_builddir)/../itcl/itcl/unix/itcl_sh\$(EXEEXT)])
100a99,100
 > CYG_AC_PATH_ITCLCONFIG
 > CYG_AC_LOAD_ITCLCONFIG
Index: library/Makefile.am
===================================================================
RCS file: /cvs/src/src/libgui/library/Makefile.am,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 Makefile.am
31c31
< ITCL_SH = $$here/../../itcl/itcl/unix/itclsh$(EXEEXT)
---
 > ITCL_SH = $$here/../../itcl/itcl/@ITCL_DIR@/itclsh$(EXEEXT)
45c45
< 	echo "pkg_mkIndex . $(PACKAGES); exit" | $(WISH)
---
 > 	echo "pkg_mkIndex . $(PACKAGES); exit" | @ITCL_SH@
Index: library/tclIndex
===================================================================
RCS file: /cvs/src/src/libgui/library/tclIndex,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 tclIndex
77,78d76
< set auto_index(send_mail) [list source [file join $dir internet.tcl]]
< set auto_index(open_url) [list source [file join $dir internet.tcl]]
Index: library/tree.tcl
===================================================================
RCS file: /cvs/src/src/libgui/library/tree.tcl,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 tree.tcl
119c119
< 	    ::bind $entry <Return> "watch y; $this fill; watch n"
---
 > 	    ::bind $entry <Return> "$this fill"
123d122
< 			 watch y
127d125
< 			 watch n
173c171,175
< 	    after idle "update idletasks; pack propagate [winfo toplevel $tree] 
$propagate"
---
 > #FIXME: what is the following code doing?
 > # I am currently seeing an error in this callback because the toplevel 
window does not exist.
 > #	    after idle "update idletasks; pack propagate $top $propagate"
 > set top [winfo toplevel $tree]
 > after idle "update idletasks ; if \[winfo exists $top\] \{pack propagate 
$top\}"
337,339c339
< 	watch y $this
< 	fill
< 	watch n $this
---
 > 	fillg
395d394
< 	    watch y $this
398d396
< 	    watch n $this
862c860
< 		-command "watch y; $this resort $i; watch n"
---
 > 		-command "$this resort $i"
Index: src/tkGraphCanvas.c
===================================================================
RCS file: /cvs/src/src/libgui/src/tkGraphCanvas.c,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 tkGraphCanvas.c
252a253
 >     char * buf;
262c263,266
<     *fp = strdup(argv[4]);
---
 >     /* This should actuall be a call like Tcl_Strdup() */
 >     buf = (char*)ckalloc (strlen(argv[4])+1);
 >     strcpy (buf, argv[4]);
 >     *fp = buf;
272c276,278
<     *tp = strdup(argv[4]);
---
 >     buf = (char*)ckalloc (strlen(argv[4])+1);
 >     strcpy (buf, argv[4]);
 >     *tp = buf;

Syd Polk		spolk@redhat.com
Engineering Manager	+1 415 777 9810 x 241
Red Hat, Inc.