diff options
| -rw-r--r-- | generic/tkCanvPs.c | 21 | ||||
| -rw-r--r-- | generic/tkCanvas.c | 7 | ||||
| -rw-r--r-- | generic/tkCanvas.h | 4 |
3 files changed, 12 insertions, 20 deletions
diff --git a/generic/tkCanvPs.c b/generic/tkCanvPs.c index 6604148..05555ae 100644 --- a/generic/tkCanvPs.c +++ b/generic/tkCanvPs.c @@ -142,7 +142,7 @@ static inline Tcl_Obj * GetPostscriptBuffer(Tcl_Interp *interp); /* *-------------------------------------------------------------- * - * TkCanvPostscriptCmd -- + * TkCanvPostscriptObjCmd -- * * This function is invoked to process the "postscript" options of the * widget command for canvas widgets. See the user documentation for @@ -158,12 +158,12 @@ static inline Tcl_Obj * GetPostscriptBuffer(Tcl_Interp *interp); */ int -TkCanvPostscriptCmd( +TkCanvPostscriptObjCmd( TkCanvas *canvasPtr, /* Information about canvas widget. */ Tcl_Interp *interp, /* Current interpreter. */ - int argc, /* Number of arguments. */ - const char **argv) /* Argument strings. Caller has already parsed - * this command enough to know that argv[1] is + Tcl_Size objc, /* Number of arguments. */ + Tcl_Obj *const objv[]) /* Argument strings. Caller has already parsed + * this command enough to know that objv[1] is * "postscript". */ { TkPostscriptInfo psInfo, *psInfoPtr = &psInfo; @@ -236,8 +236,8 @@ TkCanvPostscriptCmd( psInfo.prolog = 1; psInfo.tkwin = tkwin; Tcl_InitHashTable(&psInfo.fontTable, TCL_STRING_KEYS); - result = Tk_ConfigureWidget(interp, tkwin, configSpecs, argc-2, argv+2, - (char *) &psInfo, TK_CONFIG_ARGV_ONLY); + result = Tk_ConfigureWidget(interp, tkwin, configSpecs, objc-2, (const char **)objv+2, + (char *) &psInfo, TK_CONFIG_ARGV_ONLY|TK_CONFIG_OBJS); if (result != TCL_OK) { goto cleanup; } @@ -1196,13 +1196,11 @@ GetPostscriptPoints( #if defined(_WIN32) || defined(MAC_OSX_TK) static void TkImageGetColor( - TkColormapData *cdata, /* Colormap data */ + TCL_UNUSED(TkColormapData *), unsigned long pixel, /* Pixel value to look up */ double *red, double *green, double *blue) /* Color data to return */ { - (void)cdata; - *red = (double) GetRValue(pixel) / 255.0; *green = (double) GetGValue(pixel) / 255.0; *blue = (double) GetBValue(pixel) / 255.0; @@ -1258,7 +1256,7 @@ TkPostscriptImage( Tk_Window tkwin, Tk_PostscriptInfo psInfo, /* postscript info */ XImage *ximage, /* Image to draw */ - int x, int y, /* First pixel to output */ + int x, TCL_UNUSED(int), /* First pixel to output */ int width, int height) /* Width and height of area */ { TkPostscriptInfo *psInfoPtr = (TkPostscriptInfo *) psInfo; @@ -1271,7 +1269,6 @@ TkPostscriptImage( Visual *visual; TkColormapData cdata; Tcl_Obj *psObj; - (void)y; if (psInfoPtr->prepass) { return TCL_OK; diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 593089c..cd96b6c 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -1771,12 +1771,7 @@ CanvasWidgetCmd( break; } case CANV_POSTSCRIPT: { - const char **args = TkGetStringsFromObjs(objc, objv); - - result = TkCanvPostscriptCmd(canvasPtr, interp, objc, args); - if (args != NULL) { - ckfree(args); - } + result = TkCanvPostscriptObjCmd(canvasPtr, interp, objc, objv); break; } case CANV_RAISE: { diff --git a/generic/tkCanvas.h b/generic/tkCanvas.h index 9be431b..4adde33 100644 --- a/generic/tkCanvas.h +++ b/generic/tkCanvas.h @@ -290,8 +290,8 @@ typedef struct TkCanvas { * to the outside world: */ -MODULE_SCOPE int TkCanvPostscriptCmd(TkCanvas *canvasPtr, - Tcl_Interp *interp, int argc, const char **argv); +MODULE_SCOPE int TkCanvPostscriptObjCmd(TkCanvas *canvasPtr, + Tcl_Interp *interp, Tcl_Size argc, Tcl_Obj *const objv[]); MODULE_SCOPE int TkCanvTranslatePath(TkCanvas *canvPtr, int numVertex, double *coordPtr, int closed, XPoint *outPtr); |