More -1 -> TCL_INDEX_NONE. More TCL_UNUSED(

1 files changed, 12 insertions, 12 deletions

diff --git a/generic/tkImage.c b/generic/tkImage.c
index 56b8c67..acc6d1b 100644
--- a/generic/tkImage.c
+++ b/generic/tkImage.c
@@ -33,12 +33,12 @@ typedef struct Image {
     struct ImageModel *modelPtr;
 				/* Model for this image (identifiers image
 				 * manager, for example). */
-    ClientData instanceData;	/* One word argument to pass to image manager
+    void *instanceData;	/* One word argument to pass to image manager
 				 * when dealing with this image instance. */
     Tk_ImageChangedProc *changeProc;
 				/* Code in widget to call when image changes
 				 * in a way that affects redisplay. */
-    ClientData widgetClientData;/* Argument to pass to changeProc. */
+    void *widgetClientData;/* Argument to pass to changeProc. */
     struct Image *nextPtr;	/* Next in list of all image instances
 				 * associated with the same name. */
 } Image;
@@ -53,7 +53,7 @@ typedef struct ImageModel {
     Tk_ImageType *typePtr;	/* Information about image type. NULL means
 				 * that no image manager owns this image: the
 				 * image was deleted. */
-    ClientData modelData;	/* One-word argument to pass to image mgr when
+    void *modelData;	/* One-word argument to pass to image mgr when
 				 * dealing with the model, as opposed to
 				 * instances. */
     int width, height;		/* Last known dimensions for image. */
@@ -85,7 +85,7 @@ static Tcl_ThreadDataKey dataKey;
  * Prototypes for local functions:
  */
 
-static void		ImageTypeThreadExitProc(ClientData clientData);
+static void		ImageTypeThreadExitProc(void *clientData);
 static void		DeleteImage(ImageModel *modelPtr);
 static void		EventuallyDeleteImage(ImageModel *modelPtr,
 			    int forgetImageHashNow);
@@ -206,7 +206,7 @@ Tk_CreateImageType(
 
 int
 Tk_ImageObjCmd(
-    ClientData clientData,	/* Main window associated with interpreter. */
+    void *clientData,	/* Main window associated with interpreter. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument strings. */
@@ -392,7 +392,7 @@ Tk_ImageObjCmd(
 		    modelPtr->modelData);
 	}
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
-		(const char *)Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), -1));
+		(const char *)Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), TCL_INDEX_NONE));
 	break;
     }
     case IMAGE_DELETE:
@@ -422,7 +422,7 @@ Tk_ImageObjCmd(
 		continue;
 	    }
 	    Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
-		    (const char *)Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), -1));
+		    (const char *)Tcl_GetHashKey(&winPtr->mainPtr->imageTable, hPtr), TCL_INDEX_NONE));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	break;
@@ -435,12 +435,12 @@ Tk_ImageObjCmd(
 	for (typePtr = tsdPtr->imageTypeList; typePtr != NULL;
 		typePtr = typePtr->nextPtr) {
 	    Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
-		    typePtr->name, -1));
+		    typePtr->name, TCL_INDEX_NONE));
 	}
 	for (typePtr = tsdPtr->oldImageTypeList; typePtr != NULL;
 		typePtr = typePtr->nextPtr) {
 	    Tcl_ListObjAppendElement(NULL, resultObj, Tcl_NewStringObj(
-		    typePtr->name, -1));
+		    typePtr->name, TCL_INDEX_NONE));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	break;
@@ -485,7 +485,7 @@ Tk_ImageObjCmd(
 	case IMAGE_TYPE:
 	    if (modelPtr->typePtr != NULL) {
 		Tcl_SetObjResult(interp,
-			Tcl_NewStringObj(modelPtr->typePtr->name, -1));
+			Tcl_NewStringObj(modelPtr->typePtr->name, TCL_INDEX_NONE));
 	    }
 	    break;
 	case IMAGE_WIDTH:
@@ -609,7 +609,7 @@ Tk_GetImage(
     Tk_ImageChangedProc *changeProc,
 				/* Function to invoke when redisplay is needed
 				 * because image's pixels or size changed. */
-    ClientData clientData)	/* One-word argument to pass to damageProc. */
+    void *clientData)	/* One-word argument to pass to damageProc. */
 {
     Tcl_HashEntry *hPtr;
     ImageModel *modelPtr;
@@ -1072,7 +1072,7 @@ TkDeleteAllImages(
  *----------------------------------------------------------------------
  */
 
-ClientData
+void *
 Tk_GetImageModelData(
     Tcl_Interp *interp,		/* Interpreter in which the image was
 				 * created. */