From 31677d3e172dca5f1071f8ec34b8d21f23b2ca78 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Mon, 17 Jun 2024 22:39:29 +0000 Subject: bugfix in tkOldConfig.c --- generic/tkCanvas.c | 3 --- generic/tkOldConfig.c | 4 ++-- generic/tkUtil.c | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/generic/tkCanvas.c b/generic/tkCanvas.c index 879cf27..11fb603 100644 --- a/generic/tkCanvas.c +++ b/generic/tkCanvas.c @@ -2273,9 +2273,6 @@ ConfigureCanvas( Tk_SetBackgroundFromBorder(canvasPtr->tkwin, canvasPtr->bgBorder); - if (canvasPtr->highlightWidth < 0) { - canvasPtr->highlightWidth = 0; - } canvasPtr->inset = canvasPtr->borderWidth + canvasPtr->highlightWidth; gcValues.function = GXcopy; diff --git a/generic/tkOldConfig.c b/generic/tkOldConfig.c index 8584d8f..336ec8c 100644 --- a/generic/tkOldConfig.c +++ b/generic/tkOldConfig.c @@ -518,7 +518,7 @@ DoConfig( } break; case TK_CONFIG_PIXELS: { - int pixel = INT_MIN; + int pixel = INT_MIN; if (!nullValue && ((Tk_GetPixels(NULL, tkwin, value, &pixel) != TCL_OK) || ((pixel < 0) && !(specPtr->specFlags & TK_OPTION_NEG_OK)))) { Tcl_SetObjResult(interp, Tcl_ObjPrintf( @@ -864,7 +864,7 @@ FormatConfigValue( result = Tk_NameOfJoinStyle(*((int *)ptr)); break; case TK_CONFIG_PIXELS: - if ((*(int *)ptr >= 0) || (specPtr->specFlags & TK_OPTION_NEG_OK)) { + if ((*(int *)ptr != INT_MIN) || !(specPtr->specFlags & (TK_CONFIG_NULL_OK|TCL_NULL_OK|1))) { snprintf(buffer, 200, "%d", *((int *)ptr)); result = buffer; } diff --git a/generic/tkUtil.c b/generic/tkUtil.c index 4235ca8..3c99a4b 100644 --- a/generic/tkUtil.c +++ b/generic/tkUtil.c @@ -366,7 +366,7 @@ TkOffsetParseProc( } *((char *) q) = 0; - result = Tk_GetPixels(interp, tkwin, (char *)p, &tsoffset.xoffset); + result = Tk_GetPixels(interp, tkwin, (char *) p, &tsoffset.xoffset); *((char *) q) = ','; if (result != TCL_OK) { return TCL_ERROR; -- cgit v0.12