diff options
Diffstat (limited to 'generic/ttk')
| -rw-r--r-- | generic/ttk/ttkClamTheme.c | 13 | ||||
| -rw-r--r-- | generic/ttk/ttkDefaultTheme.c | 17 | ||||
| -rw-r--r-- | generic/ttk/ttkElements.c | 24 |
3 files changed, 25 insertions, 29 deletions
diff --git a/generic/ttk/ttkClamTheme.c b/generic/ttk/ttkClamTheme.c index 81c5641..f6cd38c 100644 --- a/generic/ttk/ttkClamTheme.c +++ b/generic/ttk/ttkClamTheme.c @@ -469,8 +469,8 @@ static void IndicatorElementDraw( svgDataPtr = (selected ? spec->onDataPtr : spec->offDataPtr); /* - * Copy the string pointed to by svgDataPtr to a newly allocated memory - * area svgDataCopy and assign the latter's address to svgDataPtr + * Copy the string pointed to by svgDataPtr to + * a newly allocated memory area svgDataCopy */ svgDataLen = strlen(svgDataPtr); svgDataCopy = (char *)attemptckalloc(svgDataLen + 1); @@ -479,16 +479,15 @@ static void IndicatorElementDraw( } memcpy(svgDataCopy, svgDataPtr, svgDataLen); svgDataCopy[svgDataLen] = '\0'; - svgDataPtr = svgDataCopy; /* * Update the colors within svgDataCopy */ - upperBdColorPtr = strstr(svgDataPtr, "9e9a91"); - lowerBdColorPtr = strstr(svgDataPtr, "cfcdc8"); - bgColorPtr = strstr(svgDataPtr, "ffffff"); - fgColorPtr = strstr(svgDataPtr, "000000"); + upperBdColorPtr = strstr(svgDataCopy, "9e9a91"); + lowerBdColorPtr = strstr(svgDataCopy, "cfcdc8"); + bgColorPtr = strstr(svgDataCopy, "ffffff"); + fgColorPtr = strstr(svgDataCopy, "000000"); assert(upperBdColorPtr); assert(lowerBdColorPtr); diff --git a/generic/ttk/ttkDefaultTheme.c b/generic/ttk/ttkDefaultTheme.c index 2271592..531fe01 100644 --- a/generic/ttk/ttkDefaultTheme.c +++ b/generic/ttk/ttkDefaultTheme.c @@ -641,8 +641,8 @@ static void IndicatorElementDraw( svgDataPtr = (selected ? spec->onDataPtr : spec->offDataPtr); /* - * Copy the string pointed to by svgDataPtr to a newly allocated memory - * area svgDataCopy and assign the latter's address to svgDataPtr + * Copy the string pointed to by svgDataPtr to + * a newly allocated memory area svgDataCopy */ svgDataLen = strlen(svgDataPtr); svgDataCopy = (char *)attemptckalloc(svgDataLen + 1); @@ -651,18 +651,17 @@ static void IndicatorElementDraw( } memcpy(svgDataCopy, svgDataPtr, svgDataLen); svgDataCopy[svgDataLen] = '\0'; - svgDataPtr = svgDataCopy; /* * Update the colors within svgDataCopy */ - shadeColorPtr = strstr(svgDataPtr, "888888"); - highlightColorPtr = strstr(svgDataPtr, "eeeeee"); - borderColorPtr = strstr(svgDataPtr, "414141"); - bgColorPtr = strstr(svgDataPtr, "d9d9d9"); - indicatorColorPtr = strstr(svgDataPtr, "ffffff"); - fgColorPtr = strstr(svgDataPtr, "000000"); + shadeColorPtr = strstr(svgDataCopy, "888888"); + highlightColorPtr = strstr(svgDataCopy, "eeeeee"); + borderColorPtr = strstr(svgDataCopy, "414141"); + bgColorPtr = strstr(svgDataCopy, "d9d9d9"); + indicatorColorPtr = strstr(svgDataCopy, "ffffff"); + fgColorPtr = strstr(svgDataCopy, "000000"); assert(shadeColorPtr); assert(highlightColorPtr); diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c index d798806..bc53bac 100644 --- a/generic/ttk/ttkElements.c +++ b/generic/ttk/ttkElements.c @@ -797,8 +797,8 @@ static void IndicatorElementDraw( (selected ? spec->onDataPtr : spec->offDataPtr)); /* - * Copy the string pointed to by svgDataPtr to a newly allocated memory - * area svgDataCopy and assign the latter's address to svgDataPtr + * Copy the string pointed to by svgDataPtr to + * a newly allocated memory area svgDataCopy */ svgDataLen = strlen(svgDataPtr); svgDataCopy = (char *)attemptckalloc(svgDataLen + 1); @@ -807,14 +807,13 @@ static void IndicatorElementDraw( } memcpy(svgDataCopy, svgDataPtr, svgDataLen); svgDataCopy[svgDataLen] = '\0'; - svgDataPtr = svgDataCopy; /* * Update the colors within svgDataCopy */ if (selected || tristate) { - bgColorPtr = strstr(svgDataPtr, "4a6984"); - fgColorPtr = strstr(svgDataPtr, "ffffff"); + bgColorPtr = strstr(svgDataCopy, "4a6984"); + fgColorPtr = strstr(svgDataCopy, "ffffff"); assert(bgColorPtr); assert(fgColorPtr); @@ -822,8 +821,8 @@ static void IndicatorElementDraw( memcpy(bgColorPtr, bgColorStr, 6); memcpy(fgColorPtr, fgColorStr, 6); } else { - bgColorPtr = strstr(svgDataPtr, "ffffff"); - borderColorPtr = strstr(svgDataPtr, "888888"); + bgColorPtr = strstr(svgDataCopy, "ffffff"); + borderColorPtr = strstr(svgDataCopy, "888888"); assert(bgColorPtr); assert(borderColorPtr); @@ -1429,8 +1428,8 @@ static void SliderElementDraw( img = Tk_GetImage(interp, tkwin, imgName, ImageChanged, NULL); if (img == NULL) { /* - * Copy the string pointed to by svgDataPtr to a newly allocated memory - * area svgDataCopy and assign the latter's address to svgDataPtr + * Copy the string pointed to by svgDataPtr to + * a newly allocated memory area svgDataCopy */ svgDataLen = strlen(svgDataPtr); svgDataCopy = (char *)attemptckalloc(svgDataLen + 1); @@ -1439,14 +1438,13 @@ static void SliderElementDraw( } memcpy(svgDataCopy, svgDataPtr, svgDataLen); svgDataCopy[svgDataLen] = '\0'; - svgDataPtr = svgDataCopy; /* * Update the colors within svgDataCopy */ - innerColorPtr = strstr(svgDataPtr, "4a6984"); - outerColorPtr = strstr(svgDataPtr, "ffffff"); - borderColorPtr = strstr(svgDataPtr, "c3c3c3"); + innerColorPtr = strstr(svgDataCopy, "4a6984"); + outerColorPtr = strstr(svgDataCopy, "ffffff"); + borderColorPtr = strstr(svgDataCopy, "c3c3c3"); assert(innerColorPtr); assert(outerColorPtr); assert(borderColorPtr); |