summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorculler <culler>2020-09-08 20:30:20 (GMT)
committerculler <culler>2020-09-08 20:30:20 (GMT)
commit69810cf540ec4e49dc76d0a1f99f9cab49a7d091 (patch)
treed9222232d2995850bf461381379ff9be9a3b734f
parent5dbab869283596c87b7024d85c52f6cc8406e186 (diff)
parentb3a1dc834a344eeb6eb6c42eee5747023e39385e (diff)
downloadtk-69810cf540ec4e49dc76d0a1f99f9cab49a7d091.zip
tk-69810cf540ec4e49dc76d0a1f99f9cab49a7d091.tar.gz
tk-69810cf540ec4e49dc76d0a1f99f9cab49a7d091.tar.bz2
Merge 8.6
-rw-r--r--macosx/ttkMacOSXTheme.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 8c9e564..65c889c 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -501,10 +501,13 @@ static void SolidFillRoundedRectangle(
NSColor *color)
{
CGPathRef path;
- CHECK_RADIUS(radius, bounds)
- CGContextSetFillColorWithColor(context, CGCOLOR(color));
+ CHECK_RADIUS(radius, bounds)
path = CGPathCreateWithRoundedRect(bounds, radius, radius, NULL);
+ if (!path) {
+ return;
+ }
+ CGContextSetFillColorWithColor(context, CGCOLOR(color));
CGContextBeginPath(context);
CGContextAddPath(context, path);
CGContextFillPath(context);