summaryrefslogtreecommitdiffstats
path: root/unix/tkUnixEmbed.c
diff options
context:
space:
mode:
authordgp@users.sourceforge.net <dgp>2002-08-05 04:30:37 (GMT)
committerdgp@users.sourceforge.net <dgp>2002-08-05 04:30:37 (GMT)
commit7f2950e2d95664dad25850185a717df6019c37e7 (patch)
tree7d072949961c0e2749f8fc33c73bf1d093c3d635 /unix/tkUnixEmbed.c
parent6f421c178b9494c37357300d21b54901efcca6d1 (diff)
downloadtk-7f2950e2d95664dad25850185a717df6019c37e7.zip
tk-7f2950e2d95664dad25850185a717df6019c37e7.tar.gz
tk-7f2950e2d95664dad25850185a717df6019c37e7.tar.bz2
Applied companion patch for Tcl Patch 585105,
updating Tk to use Tcl 8.4's fully CONST-ified interface, and fully CONSTifying Tk at the same time. This patch includes purging Tk of its last direct access to interp->result. [Bug 589853] The substantial changes include copying event sequence strings into Tcl_DStrings in tkBind.c, and copying [text] indices into Tcl_DStrings because parsing them involved overwriting them. If this causes performance trouble, that can be resolved by further converting them to Tcl_Obj's. The #defines USE_NON_CONST and USE_COMPAT_CONST have the same effect for Tk as they do for Tcl. (They actually change tcl.h)
Diffstat (limited to 'unix/tkUnixEmbed.c')
-rw-r--r--unix/tkUnixEmbed.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c
index 6020fc3..6cf9159 100644
--- a/unix/tkUnixEmbed.c
+++ b/unix/tkUnixEmbed.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkUnixEmbed.c,v 1.5 2002/06/14 22:25:12 jenglish Exp $
+ * RCS: @(#) $Id: tkUnixEmbed.c,v 1.6 2002/08/05 04:30:41 dgp Exp $
*/
#include "tkInt.h"
@@ -101,7 +101,7 @@ TkpUseWindow(interp, tkwin, string)
* if string is bogus. */
Tk_Window tkwin; /* Tk window that does not yet have an
* associated X window. */
- char *string; /* String identifying an X window to use
+ CONST char *string; /* String identifying an X window to use
* for tkwin; must be an integer value. */
{
TkWindow *winPtr = (TkWindow *) tkwin;
@@ -882,7 +882,7 @@ TkpTestembedCmd(clientData, interp, argc, argv)
ClientData clientData; /* Main window for application. */
Tcl_Interp *interp; /* Current interpreter. */
int argc; /* Number of arguments. */
- char **argv; /* Argument strings. */
+ CONST char **argv; /* Argument strings. */
{
int all;
Container *containerPtr;