diff options
| author | nijtmans <nijtmans> | 2008-11-12 00:15:24 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2008-11-12 00:15:24 (GMT) |
| commit | 08822bfc3683f6f3b0af04540c55847ed2b0ecd9 (patch) | |
| tree | 3da7e649cc710d08d3e62832325e86accb99fa4d /generic/tkTest.c | |
| parent | b230027f2cb9e767a33e63b1d09831b32431c38a (diff) | |
| download | tk-08822bfc3683f6f3b0af04540c55847ed2b0ecd9.zip tk-08822bfc3683f6f3b0af04540c55847ed2b0ecd9.tar.gz tk-08822bfc3683f6f3b0af04540c55847ed2b0ecd9.tar.bz2 | |
modify Tk_Create(Old)ImageType signature, relaxing
the constraint that every Tk_ImageType can only
be passed to this function once. This allows
tkImg to be loaded in multiple interpreters
in a thread-enabled build of Tk.
This CONSTification complies with TIP #27. It is
binary compatible with the old interface, but not
fully source compatible (although tkImg does not suffer).
Diffstat (limited to 'generic/tkTest.c')
| -rw-r--r-- | generic/tkTest.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkTest.c b/generic/tkTest.c index cba8546..b7a27a6 100644 --- a/generic/tkTest.c +++ b/generic/tkTest.c @@ -13,7 +13,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkTest.c,v 1.40 2008/10/30 23:18:59 nijtmans Exp $ + * RCS: @(#) $Id: tkTest.c,v 1.41 2008/11/12 00:15:26 nijtmans Exp $ */ #include "tkInt.h" @@ -61,8 +61,8 @@ typedef struct TImageInstance { */ static int ImageCreate(Tcl_Interp *interp, - char *name, int argc, Tcl_Obj *const objv[], - Tk_ImageType *typePtr, Tk_ImageMaster master, + const char *name, int argc, Tcl_Obj *const objv[], + const Tk_ImageType *typePtr, Tk_ImageMaster master, ClientData *clientDataPtr); static ClientData ImageGet(Tk_Window tkwin, ClientData clientData); static void ImageDisplay(ClientData clientData, @@ -1491,11 +1491,11 @@ static int ImageCreate( Tcl_Interp *interp, /* Interpreter for application containing * image. */ - char *name, /* Name to use for image. */ + const char *name, /* Name to use for image. */ int objc, /* Number of arguments. */ Tcl_Obj *const objv[], /* Argument strings for options (doesn't * include image name or type). */ - Tk_ImageType *typePtr, /* Pointer to our type record (not used). */ + const Tk_ImageType *typePtr, /* Pointer to our type record (not used). */ Tk_ImageMaster master, /* Token for image, to be used by us in later * callbacks. */ ClientData *clientDataPtr) /* Store manager's token for image here; it |