summaryrefslogtreecommitdiffstats
path: root/generic/tk.h
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-11-12 00:15:24 (GMT)
committernijtmans <nijtmans>2008-11-12 00:15:24 (GMT)
commit08822bfc3683f6f3b0af04540c55847ed2b0ecd9 (patch)
tree3da7e649cc710d08d3e62832325e86accb99fa4d /generic/tk.h
parentb230027f2cb9e767a33e63b1d09831b32431c38a (diff)
downloadtk-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/tk.h')
-rw-r--r--generic/tk.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tk.h b/generic/tk.h
index 003143c..516205b 100644
--- a/generic/tk.h
+++ b/generic/tk.h
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tk.h,v 1.123 2008/11/02 11:20:03 dkf Exp $
+ * RCS: @(#) $Id: tk.h,v 1.124 2008/11/12 00:15:26 nijtmans Exp $
*/
#ifndef _TK
@@ -1187,8 +1187,8 @@ typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, char *name, int argc,
char **argv, Tk_ImageType *typePtr, Tk_ImageMaster master,
ClientData *masterDataPtr);
#else
-typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, char *name, int objc,
- Tcl_Obj *const objv[], Tk_ImageType *typePtr, Tk_ImageMaster master,
+typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, CONST86 char *name, int objc,
+ Tcl_Obj *const objv[], CONST86 Tk_ImageType *typePtr, Tk_ImageMaster master,
ClientData *masterDataPtr);
#endif
typedef ClientData (Tk_ImageGetProc) (Tk_Window tkwin, ClientData masterData);