diff options
| author | dgp@users.sourceforge.net <dgp> | 2002-08-05 04:30:37 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2002-08-05 04:30:37 (GMT) |
| commit | 7f2950e2d95664dad25850185a717df6019c37e7 (patch) | |
| tree | 7d072949961c0e2749f8fc33c73bf1d093c3d635 /generic/tkImgBmap.c | |
| parent | 6f421c178b9494c37357300d21b54901efcca6d1 (diff) | |
| download | tk-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 'generic/tkImgBmap.c')
| -rw-r--r-- | generic/tkImgBmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c index 726f5da..d89663e 100644 --- a/generic/tkImgBmap.c +++ b/generic/tkImgBmap.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkImgBmap.c,v 1.14 2002/01/25 21:09:37 dgp Exp $ + * RCS: @(#) $Id: tkImgBmap.c,v 1.15 2002/08/05 04:30:39 dgp Exp $ */ #include "tkInt.h" @@ -254,7 +254,7 @@ ImgBmapConfigureMaster(masterPtr, objc, objv, flags) BitmapInstance *instancePtr; int maskWidth, maskHeight, dummy1, dummy2; - char **argv = (char **) ckalloc((objc+1) * sizeof(char *)); + CONST char **argv = (CONST char **) ckalloc((objc+1) * sizeof(char *)); for (dummy1 = 0; dummy1 < objc; dummy1++) { argv[dummy1]=Tcl_GetString(objv[dummy1]); } |