diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-11 21:58:15 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-10-11 21:58:15 (GMT) |
| commit | b2a490e00b366529ee01568a6e3eb47fd718d59f (patch) | |
| tree | a29d52a3dbbbf0de75a893365d283a51a95ad24c /generic/ttk/ttkElements.c | |
| parent | 214d96af007b0c11714f5d497a37405807450a72 (diff) | |
| parent | e5e9aa998d3fc89826a2546bf137cc70f70aa4ea (diff) | |
| download | tk-b2a490e00b366529ee01568a6e3eb47fd718d59f.zip tk-b2a490e00b366529ee01568a6e3eb47fd718d59f.tar.gz tk-b2a490e00b366529ee01568a6e3eb47fd718d59f.tar.bz2 | |
Merge 8.6. Some C++-fixes
Diffstat (limited to 'generic/ttk/ttkElements.c')
| -rw-r--r-- | generic/ttk/ttkElements.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/ttk/ttkElements.c b/generic/ttk/ttkElements.c index bbe5a95..17bc1ae 100644 --- a/generic/ttk/ttkElements.c +++ b/generic/ttk/ttkElements.c @@ -799,8 +799,8 @@ static void IndicatorElementDraw( * Update the colors within svgDataCopy */ if (selected || tristate) { - bgColorPtr = strstr(svgDataPtr, "4a6984"); - fgColorPtr = strstr(svgDataPtr, "ffffff"); + bgColorPtr = strstr((char *)svgDataPtr, "4a6984"); + fgColorPtr = strstr((char *)svgDataPtr, "ffffff"); assert(bgColorPtr); assert(fgColorPtr); @@ -808,8 +808,8 @@ static void IndicatorElementDraw( memcpy(bgColorPtr, bgColorStr, 6); memcpy(fgColorPtr, fgColorStr, 6); } else { - bgColorPtr = strstr(svgDataPtr, "ffffff"); - borderColorPtr = strstr(svgDataPtr, "888888"); + bgColorPtr = strstr((char *)svgDataPtr, "ffffff"); + borderColorPtr = strstr((char *)svgDataPtr, "888888"); assert(bgColorPtr); assert(borderColorPtr); @@ -1430,9 +1430,9 @@ static void SliderElementDraw( /* * Update the colors within svgDataCopy */ - innerColorPtr = strstr(svgDataPtr, "4a6984"); - outerColorPtr = strstr(svgDataPtr, "ffffff"); - borderColorPtr = strstr(svgDataPtr, "c3c3c3"); + innerColorPtr = strstr((char *)svgDataPtr, "4a6984"); + outerColorPtr = strstr((char *)svgDataPtr, "ffffff"); + borderColorPtr = strstr((char *)svgDataPtr, "c3c3c3"); assert(innerColorPtr); assert(outerColorPtr); assert(borderColorPtr); |