projects/dwt-mac: dwt/graphics/GC.d comparison

comparison dwt/graphics/GC.d @ 46:cfa563df4fdd

Updated Widget and Display to 3.514

author	Jacob Carlborg <doob@me.com>
date	Fri, 05 Dec 2008 16:00:41 +0100
parents	d8635bb48c7c
children	62202ce0039f

comparison

equal deleted inserted replaced

-:d8635bb48c7c
+:cfa563df4fdd
 /*******************************************************************************
 * Copyright (c) 2000, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 import dwt.internal.cocoa.NSColor;
 import dwt.internal.cocoa.NSFont;
 import dwt.internal.cocoa.NSGradient;
 import dwt.internal.cocoa.NSGraphicsContext;
 import dwt.internal.cocoa.NSImage;
-import dwt.internal.cocoa.NSInteger;
 import dwt.internal.cocoa.NSMutableDictionary;
 import dwt.internal.cocoa.NSMutableParagraphStyle;
 import dwt.internal.cocoa.NSPoint;
 import dwt.internal.cocoa.NSRect;
 import dwt.internal.cocoa.NSSize;
 import dwt.graphics.Rectangle;
 import dwt.graphics.Region;
 import dwt.graphics.Resource;
 import dwt.graphics.RGB;
 import dwt.graphics.Transform;
-import dwt.internal.cocoa.CGFloat;
+import dwt.internal.c.Carbon;
+import dwt.internal.objc.cocoa.Cocoa;
 import objc = dwt.internal.objc.runtime;
 /**
 * Class <code>GC</code> is where all of the drawing capabilities that are
 * supported by DWT are located. Instances are used to draw on either an
 return gc;
 }
 NSAutoreleasePool checkGC (int mask) {
 NSAutoreleasePool pool = null;
-if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
+if (!NSThread.isMainThread()) pool = cast(NSAutoreleasePool) (new NSAutoreleasePool()).alloc().init();
 if ((mask & (CLIPPING | TRANSFORM)) !is 0) {
 NSGraphicsContext.setCurrentContext(handle);
 NSView view = data.view;
 if (view !is null && data.paintRect is null) {
 NSRect rect = view.convertRect_toView_(view.bounds(), null);
 rect.width !is data.windowRect.width || rect.height !is data.windowRect.height ||
 visibleRect.x !is data.visibleRect.x || visibleRect.y !is data.visibleRect.y ||
 visibleRect.width !is data.visibleRect.width || visibleRect.height !is data.visibleRect.height)
 {
 data.state &= ~CLIPPING;
-data.windowRect = rect;
+data.windowRectStruct = rect;
-data.visibleRect = visibleRect;
+data.windowRect = &data.windowRectStruct;
+data.visibleRectStruct = visibleRect;
+data.visibleRect = &data.visibleRectStruct;
 }
 }
 if ((data.state & CLIPPING) is 0 || (data.state & TRANSFORM) is 0) {
 handle.restoreGraphicsState();
 handle.saveGraphicsState();
 if (view !is null && data.paintRect is null) {
 NSAffineTransform transform = NSAffineTransform.transform();
-NSRect rect = data.windowRect;
+NSRect rect = data.windowRectStruct;
 transform.translateXBy(rect.x, rect.y + rect.height);
 transform.scaleXBy(1, -1);
 transform.concat();
-NSBezierPath.bezierPathWithRect(data.visibleRect).addClip();
+NSBezierPath.bezierPathWithRect(data.visibleRectStruct).addClip();
 }
 if (data.clipPath !is null) data.clipPath.addClip();
 if (data.transform !is null) data.transform.concat();
 mask &= ~(TRANSFORM | CLIPPING);
 data.state |= TRANSFORM | CLIPPING;
 case DWT.LINE_DOT:
 case DWT.LINE_DASH:
 case DWT.LINE_DASHDOT:
 case DWT.LINE_DASHDOTDOT:
 state |= LINE_STYLE;
+default: assert(false);
 }
 }
 if ((state & LINE_STYLE) !is 0) {
 CGFloat[] dashes = null;
 CGFloat width = data.lineWidth;
 case DWT.LINE_DASH: dashes = width !is 0 ? LINE_DASH : LINE_DASH_ZERO; break;
 case DWT.LINE_DOT: dashes = width !is 0 ? LINE_DOT : LINE_DOT_ZERO; break;
 case DWT.LINE_DASHDOT: dashes = width !is 0 ? LINE_DASHDOT : LINE_DASHDOT_ZERO; break;
 case DWT.LINE_DASHDOTDOT: dashes = width !is 0 ? LINE_DASHDOTDOT : LINE_DASHDOTDOT_ZERO; break;
 case DWT.LINE_CUSTOM: dashes = data.lineDashes; break;
+default: assert(false);
 }
 if (dashes !is null) {
 CGFloat[] lengths = new CGFloat[dashes.length];
 for (int i = 0; i < lengths.length; i++) {
 lengths[i] = width is 0 || data.lineStyle is DWT.LINE_CUSTOM ? dashes[i] : dashes[i] * width;
 path.setMiterLimit(data.lineMiterLimit);
 }
 if ((state & LINE_JOIN) !is 0) {
 NSLineJoinStyle joinStyle;
 switch (data.lineJoin) {
-case DWT.JOIN_MITER: joinStyle = NSMiterLineJoinStyle; break;
+case DWT.JOIN_MITER: joinStyle = OS.NSMiterLineJoinStyle; break;
-case DWT.JOIN_ROUND: joinStyle = NSRoundLineJoinStyle; break;
+case DWT.JOIN_ROUND: joinStyle = OS.NSRoundLineJoinStyle; break;
-case DWT.JOIN_BEVEL: joinStyle = NSBevelLineJoinStyle; break;
+case DWT.JOIN_BEVEL: joinStyle = OS.NSBevelLineJoinStyle; break;
+default: assert(false);
 }
 path.setLineJoinStyle(joinStyle);
 }
 if ((state & LINE_CAP) !is 0) {
 NSLineCapStyle capStyle;
 switch (data.lineCap) {
-case DWT.CAP_ROUND: capStyle = NSRoundLineCapStyle; break;
+case DWT.CAP_ROUND: capStyle = OS.NSRoundLineCapStyle; break;
-case DWT.CAP_FLAT: capStyle = NSButtLineCapStyle; break;
+case DWT.CAP_FLAT: capStyle = OS.NSButtLineCapStyle; break;
-case DWT.CAP_SQUARE: capStyle = NSSquareLineCapStyle; break;
+case DWT.CAP_SQUARE: capStyle = OS.NSSquareLineCapStyle; break;
+default: assert(false);
 }
 path.setLineCapStyle(capStyle);
 }
 if ((state & DRAW_OFFSET) !is 0) {
 data.drawXOffset = data.drawYOffset = 0;
 dict.setObject(color, OS.NSForegroundColorAttributeName);
 dict.setObject(data.font.handle, OS.NSFontAttributeName);
 if ((flags & DWT.DRAW_TRANSPARENT) is 0) {
 CGFloat[] background = data.background;
 color = NSColor.colorWithDeviceRed(background[0], background[1], background[2], data.alpha / 255f);
-dict.setObject(color, OS.FuncNSBackgroundColorAttributeName());
+dict.setObject(color, OS.NSBackgroundColorAttributeName);
 }
 if ((flags & DWT.DRAW_TAB) is 0) {
-NSMutableParagraphStyle paragraph = (NSMutableParagraphStyle)new NSMutableParagraphStyle().alloc().init();
+NSMutableParagraphStyle paragraph = cast(NSMutableParagraphStyle)(new NSMutableParagraphStyle()).alloc().init();
 paragraph.setAlignment(OS.NSLeftTextAlignment);
 paragraph.setLineBreakMode(OS.NSLineBreakByClipping);
 paragraph.setTabStops(NSArray.array());
 dict.setObject(paragraph, OS.NSParagraphStyleAttributeName);
 paragraph.release();
 if (paintRect !is null) {
 region.intersect(cast(int)paintRect.x, cast(int)paintRect.y, cast(int)paintRect.width, cast(int)paintRect.height);
 }
 if (data.clipPath !is null) {
 NSBezierPath clip = data.clipPath.bezierPathByFlatteningPath();
-int count = (int)/*64*/clip.elementCount();
+int count = cast(int)/*64*/clip.elementCount();
 int pointCount = 0;
 Region clipRgn = new Region(device);
 int[] pointArray = new int[count * 2];
 NSPointArray points = cast(NSPointArray) OS.malloc(NSPoint.sizeof);
 if (points is null) DWT.error(DWT.ERROR_NO_HANDLES);
 *
 * @since 3.1
 */
 public int getInterpolation() {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-int interpolation = (int)/*64*/handle.imageInterpolation();
+int interpolation = cast(int)/*64*/handle.imageInterpolation();
 switch (interpolation) {
 case OS.NSImageInterpolationDefault: return DWT.DEFAULT;
 case OS.NSImageInterpolationNone: return DWT.NONE;
 case OS.NSImageInterpolationLow: return DWT.LOW;
 case OS.NSImageInterpolationHigh: return DWT.HIGH;

Mercurial > projects > dwt-mac

comparison dwt/graphics/GC.d @ 46:cfa563df4fdd