diff options
| author | dgp <dgp@users.sourceforge.net> | 2002-08-05 04:30:37 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2002-08-05 04:30:37 (GMT) |
| commit | b5333ac3910c2299be88875fe833d76136a92fc0 (patch) | |
| tree | 7d072949961c0e2749f8fc33c73bf1d093c3d635 /generic/tkImage.c | |
| parent | 54f11088e5bee7a0f06235e8b67cdde9dfa614d4 (diff) | |
| download | tk-b5333ac3910c2299be88875fe833d76136a92fc0.zip tk-b5333ac3910c2299be88875fe833d76136a92fc0.tar.gz tk-b5333ac3910c2299be88875fe833d76136a92fc0.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/tkImage.c')
| -rw-r--r-- | generic/tkImage.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkImage.c b/generic/tkImage.c index 2a2aef8..548be74 100644 --- a/generic/tkImage.c +++ b/generic/tkImage.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: tkImage.c,v 1.16 2002/06/18 01:00:59 mdejong Exp $ + * RCS: @(#) $Id: tkImage.c,v 1.17 2002/08/05 04:30:39 dgp Exp $ */ #include "tkInt.h" @@ -506,7 +506,7 @@ Tk_ImageChanged(imageMaster, x, y, width, height, imageWidth, *---------------------------------------------------------------------- */ -char * +CONST char * Tk_NameOfImage(imageMaster) Tk_ImageMaster imageMaster; /* Token for image. */ { @@ -544,7 +544,7 @@ Tk_GetImage(interp, tkwin, name, changeProc, clientData) * can't be found. */ Tk_Window tkwin; /* Token for window in which image will * be used. */ - char *name; /* Name of desired image. */ + CONST char *name; /* Name of desired image. */ Tk_ImageChangedProc *changeProc; /* Procedure to invoke when redisplay is * needed because image's pixels or size @@ -853,7 +853,7 @@ void Tk_DeleteImage(interp, name) Tcl_Interp *interp; /* Interpreter in which the image was * created. */ - char *name; /* Name of image. */ + CONST char *name; /* Name of image. */ { Tcl_HashEntry *hPtr; TkWindow *winPtr; @@ -1004,7 +1004,7 @@ ClientData Tk_GetImageMasterData(interp, name, typePtrPtr) Tcl_Interp *interp; /* Interpreter in which the image was * created. */ - char *name; /* Name of image. */ + CONST char *name; /* Name of image. */ Tk_ImageType **typePtrPtr; /* Points to location to fill in with * pointer to type information for image. */ { |