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/tkImgBmap.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/tkImgBmap.c')
| -rw-r--r-- | generic/tkImgBmap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tkImgBmap.c b/generic/tkImgBmap.c index 3fc7561..b7de72a 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.26 2008/11/05 22:48:58 nijtmans Exp $ + * RCS: @(#) $Id: tkImgBmap.c,v 1.27 2008/11/12 00:15:26 nijtmans Exp $ */ #include "tkInt.h" @@ -77,8 +77,8 @@ typedef struct BitmapInstance { static int GetByte(Tcl_Channel chan); static int ImgBmapCreate(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 ImgBmapGet(Tk_Window tkwin, ClientData clientData); static void ImgBmapDisplay(ClientData clientData, @@ -175,11 +175,11 @@ static int ImgBmapCreate( Tcl_Interp *interp, /* Interpreter for application containing * image. */ - char *name, /* Name to use for image. */ + const char *name, /* Name to use for image. */ int argc, /* Number of arguments. */ Tcl_Obj *const argv[], /* Argument objects 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 |