Mercurial > projects > dwt-mac
diff dwt/graphics/Color.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 |
line wrap: on
line diff
--- a/dwt/graphics/Color.d Mon Dec 01 17:07:00 2008 +0100 +++ b/dwt/graphics/Color.d Fri Dec 05 16:00:41 2008 +0100 @@ -23,7 +23,7 @@ import dwt.graphics.Device; import dwt.graphics.Resource; import dwt.graphics.RGB; -import dwt.internal.cocoa.CGFloat; +import dwt.internal.c.Carbon; /** * Instances of this class manage the operating system resources that @@ -139,7 +139,7 @@ if (object is this) return true; if (!( null !is cast(Color)object )) return false; Color color = cast(Color)object; - float[] rgbColor = color.handle; + CGFloat[] rgbColor = color.handle; if (handle is rgbColor) return true; return device is color.device && cast(int)(handle[0] * 255) is cast(int)(rgbColor[0] * 255) && @@ -237,7 +237,7 @@ * * @private */ -public static Color cocoa_new(Device device, float[] rgbColor) { +public static Color cocoa_new(Device device, CGFloat[] rgbColor) { Color color = new Color(device); color.handle = rgbColor; return color; @@ -249,7 +249,7 @@ (blue > 255) || (blue < 0)) { DWT.error(DWT.ERROR_INVALID_ARGUMENT); } - float[] rgbColor = new float[4]; + CGFloat[] rgbColor = new CGFloat[4]; rgbColor[0] = red / 255f; rgbColor[1] = green / 255f; rgbColor[2] = blue / 255f;