diff options
| -rw-r--r-- | macosx/ttkMacOSXTheme.c | 10 | ||||
| -rw-r--r-- | macosx/ttkMacOSXTheme.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index ca3b2ad..9ebae52 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -160,14 +160,14 @@ CGColorFromGray( return nscolor.CGColor; } -#define CGCOLOR(nscolor) nscolor.CGColor +#define CGCOLOR(nscolor) (nscolor).CGColor #else -#define CGCOLOR(nscolor) nil -#define CGColorFromRGBA(rgba) nil -#define CGColorFromGray(gray) nil -#define CGPathCreateWithRoundedRect(w, x, y, z) nil +#define CGCOLOR(nscolor) NULL +#define CGColorFromRGBA(rgba) NULL +#define CGColorFromGray(gray) NULL +#define CGPathCreateWithRoundedRect(w, x, y, z) NULL #endif diff --git a/macosx/ttkMacOSXTheme.h b/macosx/ttkMacOSXTheme.h index 749320f..977c168 100644 --- a/macosx/ttkMacOSXTheme.h +++ b/macosx/ttkMacOSXTheme.h @@ -539,9 +539,9 @@ static ThemeFrameParams * been configured and has size 1x1, so there is nothing to draw anyway. */ -#define CHECK_RADIUS(radius, bounds) \ - if (radius > bounds.size.width / 2 || radius > bounds.size.height / 2) { \ - return; \ +#define CHECK_RADIUS(radius, bounds) \ + if ((radius) > (bounds).size.width / 2 || (radius) > (bounds).size.height / 2) { \ + return; \ } /* |