summaryrefslogtreecommitdiffstats
path: root/generic/tkCanvas.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-10-26 09:24:56 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-10-26 09:24:56 (GMT)
commitc25f08d8cfc7cf44411145cc13f3d201bb9fbf86 (patch)
treea15cd89ae53dde7838588d24d9840624355c58a7 /generic/tkCanvas.c
parent7c6b2012e75a7c80f78d549fc54ba1613bcfa5cc (diff)
downloadtk-c25f08d8cfc7cf44411145cc13f3d201bb9fbf86.zip
tk-c25f08d8cfc7cf44411145cc13f3d201bb9fbf86.tar.gz
tk-c25f08d8cfc7cf44411145cc13f3d201bb9fbf86.tar.bz2
Make all Destroy??? functions match the Tcl_FreeProc signature. That will prevent compiler warnings in all thinkable situations.
Diffstat (limited to 'generic/tkCanvas.c')
-rw-r--r--generic/tkCanvas.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c
index 12389a5..2d90e36 100644
--- a/generic/tkCanvas.c
+++ b/generic/tkCanvas.c
@@ -246,7 +246,7 @@ static int ConfigureCanvas(Tcl_Interp *interp,
static void DefaultRotateImplementation(TkCanvas *canvasPtr,
Tk_Item *itemPtr, double x, double y,
double angleRadians);
-static void DestroyCanvas(void *memPtr);
+static Tcl_FreeProc DestroyCanvas;
static int DrawCanvas(Tcl_Interp *interp, void *clientData, Tk_PhotoHandle photohandle, int subsample, int zoom);
static void DisplayCanvas(void *clientData);
static void DoItem(Tcl_Obj *accumObj,
@@ -2242,7 +2242,11 @@ CanvasWidgetCmd(
static void
DestroyCanvas(
+#if TCL_MAJOR_VERSION > 8
void *memPtr) /* Info about canvas widget. */
+#else
+ char *memPtr)
+#endif
{
TkCanvas *canvasPtr = (TkCanvas *)memPtr;
Tk_Item *itemPtr;