More -1 -> TCL_INDEX_NONE. More TCL_UNUSED(

1 files changed, 7 insertions, 11 deletions

diff --git a/generic/tkCanvBmap.c b/generic/tkCanvBmap.c
index 6a6de42..7a11822 100644
--- a/generic/tkCanvBmap.c
+++ b/generic/tkCanvBmap.c
@@ -417,12 +417,11 @@ ConfigureBitmap(
 
 static void
 DeleteBitmap(
-    Tk_Canvas canvas,		/* Info about overall canvas widget. */
+    TCL_UNUSED(Tk_Canvas),		/* Info about overall canvas widget. */
     Tk_Item *itemPtr,		/* Item that is being deleted. */
     Display *display)		/* Display containing window for canvas. */
 {
     BitmapItem *bmapPtr = (BitmapItem *) itemPtr;
-    (void)canvas;
 
     if (bmapPtr->bitmap != None) {
 	Tk_FreeBitmap(display, bmapPtr->bitmap);
@@ -673,13 +672,12 @@ DisplayBitmap(
 
 static double
 BitmapToPoint(
-    Tk_Canvas canvas,		/* Canvas containing item. */
+    TCL_UNUSED(Tk_Canvas),		/* Canvas containing item. */
     Tk_Item *itemPtr,		/* Item to check against point. */
     double *coordPtr)		/* Pointer to x and y coordinates. */
 {
     BitmapItem *bmapPtr = (BitmapItem *) itemPtr;
     double x1, x2, y1, y2, xDiff, yDiff;
-    (void)canvas;
 
     x1 = bmapPtr->header.x1;
     y1 = bmapPtr->header.y1;
@@ -730,14 +728,13 @@ BitmapToPoint(
 
 static int
 BitmapToArea(
-    Tk_Canvas canvas,		/* Canvas containing item. */
+    TCL_UNUSED(Tk_Canvas),		/* Canvas containing item. */
     Tk_Item *itemPtr,		/* Item to check against rectangle. */
     double *rectPtr)		/* Pointer to array of four coordinates
 				 * (x1,y1,x2,y2) describing rectangular
 				 * area. */
 {
     BitmapItem *bmapPtr = (BitmapItem *) itemPtr;
-    (void)canvas;
 
     if ((rectPtr[2] <= bmapPtr->header.x1)
 	    || (rectPtr[0] >= bmapPtr->header.x2)
@@ -879,7 +876,7 @@ BitmapToPostscript(
     Tcl_Interp *interp,		/* Leave Postscript or error message here. */
     Tk_Canvas canvas,		/* Information about overall canvas. */
     Tk_Item *itemPtr,		/* Item for which Postscript is wanted. */
-    int prepass)		/* 1 means this is a prepass to collect font
+    TCL_UNUSED(int))		/* 1 means this is a prepass to collect font
 				 * information; 0 means final Postscript is
 				 * being created. */
 {
@@ -893,7 +890,6 @@ BitmapToPostscript(
     Tk_State state = itemPtr->state;
     Tcl_Obj *psObj;
     Tcl_InterpState interpState;
-    (void)prepass;
 
     if (state == TK_STATE_NULL) {
 	state = Canvas(canvas)->canvas_state;
@@ -969,7 +965,7 @@ BitmapToPostscript(
 	Tk_CanvasPsColor(interp, canvas, bgColor);
 	Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp));
 
-	Tcl_AppendToObj(psObj, "fill\n", -1);
+	Tcl_AppendToObj(psObj, "fill\n", TCL_INDEX_NONE);
     }
 
     /*
@@ -987,7 +983,7 @@ BitmapToPostscript(
 	if (width > 60000) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "can't generate Postscript for bitmaps more than 60000"
-		    " pixels wide", -1));
+		    " pixels wide", TCL_INDEX_NONE));
 	    Tcl_SetErrorCode(interp, "TK", "CANVAS", "PS", "MEMLIMIT", NULL);
 	    goto error;
 	}
@@ -1014,7 +1010,7 @@ BitmapToPostscript(
 		    rowsThisTime);
 	    Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp));
 
-	    Tcl_AppendToObj(psObj, "\n} imagemask\n", -1);
+	    Tcl_AppendToObj(psObj, "\n} imagemask\n", TCL_INDEX_NONE);
 	}
     }