From f90bcf3263b80b96754977ddbd5309704cf817fb Mon Sep 17 00:00:00 2001 From: thomasvl Date: Fri, 9 May 2008 18:53:09 +0000 Subject: Flush out suppport for 64bit, GC support. Added some more xcode configs related to the above. Removed some classes that the unittesting doesn't need (and aren't able to support 64bit). add base64, httpfetcher, and progress monitor stream. --- AppKit/GTMNSBezierPath+RoundRect.m | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'AppKit/GTMNSBezierPath+RoundRect.m') diff --git a/AppKit/GTMNSBezierPath+RoundRect.m b/AppKit/GTMNSBezierPath+RoundRect.m index 4b98dc9..d4e5050 100644 --- a/AppKit/GTMNSBezierPath+RoundRect.m +++ b/AppKit/GTMNSBezierPath+RoundRect.m @@ -24,14 +24,16 @@ @implementation NSBezierPath (GTMBezierPathRoundRectAdditions) -+ (NSBezierPath *)gtm_bezierPathWithRoundRect:(NSRect)rect cornerRadius:(float)radius { ++ (NSBezierPath *)gtm_bezierPathWithRoundRect:(NSRect)rect + cornerRadius:(CGFloat)radius { NSBezierPath *bezier = [NSBezierPath bezierPath]; [bezier gtm_appendBezierPathWithRoundRect:rect cornerRadius:radius]; return bezier; } -- (void)gtm_appendBezierPathWithRoundRect:(NSRect)rect cornerRadius:(float)radius { +- (void)gtm_appendBezierPathWithRoundRect:(NSRect)rect + cornerRadius:(CGFloat)radius { if (!NSIsEmptyRect(rect)) { if (radius > 0.0) { // Clamp radius to be no larger than half the rect's width or height. @@ -42,10 +44,18 @@ NSPoint bottomRight = NSMakePoint(NSMaxX(rect), NSMinY(rect)); [self moveToPoint:NSMakePoint(NSMidX(rect), NSMaxY(rect))]; - [self appendBezierPathWithArcFromPoint:topLeft toPoint:rect.origin radius:radius]; - [self appendBezierPathWithArcFromPoint:rect.origin toPoint:bottomRight radius:radius]; - [self appendBezierPathWithArcFromPoint:bottomRight toPoint:topRight radius:radius]; - [self appendBezierPathWithArcFromPoint:topRight toPoint:topLeft radius:radius]; + [self appendBezierPathWithArcFromPoint:topLeft + toPoint:rect.origin + radius:radius]; + [self appendBezierPathWithArcFromPoint:rect.origin + toPoint:bottomRight + radius:radius]; + [self appendBezierPathWithArcFromPoint:bottomRight + toPoint:topRight + radius:radius]; + [self appendBezierPathWithArcFromPoint:topRight + toPoint:topLeft + radius:radius]; [self closePath]; } else { // When radius <= 0.0, use plain rectangle. -- cgit v1.2.3