diff options
| author | dgp <dgp@noemail.net> | 2002-08-05 04:30:37 (GMT) |
|---|---|---|
| committer | dgp <dgp@noemail.net> | 2002-08-05 04:30:37 (GMT) |
| commit | 2ad35b1f85c0b9aebda5d00fdb5a4507b8bc6e69 (patch) | |
| tree | 7d072949961c0e2749f8fc33c73bf1d093c3d635 /generic/tkCanvText.c | |
| parent | 5e3b455efa8d24e25a42bb2b12fb7c4b1496034a (diff) | |
| download | tk-2ad35b1f85c0b9aebda5d00fdb5a4507b8bc6e69.zip tk-2ad35b1f85c0b9aebda5d00fdb5a4507b8bc6e69.tar.gz tk-2ad35b1f85c0b9aebda5d00fdb5a4507b8bc6e69.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)
FossilOrigin-Name: 5603f01aa35a127f83db9bb68f3b1ff9e5bb64de
Diffstat (limited to 'generic/tkCanvText.c')
| -rw-r--r-- | generic/tkCanvText.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tkCanvText.c b/generic/tkCanvText.c index 5254431..a7b9aa3 100644 --- a/generic/tkCanvText.c +++ b/generic/tkCanvText.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkCanvText.c,v 1.13 2002/05/26 09:09:19 pspjuth Exp $ + * RCS: @(#) $Id: tkCanvText.c,v 1.14 2002/08/05 04:30:38 dgp Exp $ */ #include <stdio.h> @@ -407,8 +407,8 @@ ConfigureText(interp, canvas, itemPtr, objc, objv, flags) Tk_State state; tkwin = Tk_CanvasTkwin(canvas); - if (Tk_ConfigureWidget(interp, tkwin, configSpecs, objc, (char **) objv, - (char *) textPtr, flags|TK_CONFIG_OBJS) != TCL_OK) { + if (TCL_OK != Tk_ConfigureWidget(interp, tkwin, configSpecs, objc, + (CONST char **) objv, (char *) textPtr, flags|TK_CONFIG_OBJS)) { return TCL_ERROR; } |