--- a/dwt/internal/cocoa/NSAffineTransform.d	Tue Oct 21 15:20:04 2008 +0200
+++ b/dwt/internal/cocoa/NSAffineTransform.d	Mon Dec 01 17:07:00 2008 +0100
@@ -1,19 +1,20 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
+/*******************************************************************************
+ * 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
  *
  * Contributors:
- *     IBM Corporation - initial API and implementation
+ *    IBM Corporation - initial API and implementation
  *     
  * Port to the D programming language:
- *     Jacob Carlborg <jacob.carlborg@gmail.com>
+ *     Jacob Carlborg <doob@me.com>
  *******************************************************************************/
 module dwt.internal.cocoa.NSAffineTransform;
 
-import dwt.internal.cocoa.CGFloat;
+import dwt.internal.c.Carbon;
+import cocoa = dwt.internal.cocoa.id;
 import dwt.internal.cocoa.NSAffineTransformStruct;
 import dwt.internal.cocoa.NSObject;
 import dwt.internal.cocoa.NSPoint;
@@ -23,102 +24,90 @@
 
 public class NSAffineTransform : NSObject
 {
-    public this ()
-    {
-        super();
-    }
-
-    public this (objc.id id)
-    {
-        super(id);
-    }
+    
+public this ()
+{
+    super();
+}
 
-    public void appendTransform (NSAffineTransform transform)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_appendTransform_1, transform !is null ? transform.id_ : null);
-    }
+public this (objc.id id)
+{
+    super(id);
+}
 
-    public NSAffineTransform initWithTransform (NSAffineTransform transform)
-    {
-        objc.id result = OS.objc_msgSend(this.id_, OS.sel_initWithTransform_1, transform !is null ? transform.id_ : null);
-        return result !is null ? this : null;
-    }
+public this(cocoa.id id) {
+    super(id);
+}
+
+public void concat() {
+    OS.objc_msgSend(this.id, OS.sel_concat);
+}
 
-    public void invert ()
-    {
-        OS.objc_msgSend(this.id_, OS.sel_invert);
-    }
+public NSAffineTransform initWithTransform (NSAffineTransform transform)
+{
+    objc.id result = OS.objc_msgSend(this.id, OS.sel_initWithTransform_1, transform !is null ? transform.id : null);
+    return result !is null ? this : null;
+}
 
-    public void set ()
-    {
-        OS.objc_msgSend(this.id_, OS.sel_set);
-    }
+public void invert ()
+{
+    OS.objc_msgSend(this.id, OS.sel_invert);
+}
 
-    public void concat ()
-    {
-        OS.objc_msgSend(this.id_, OS.sel_concat);
-    }
 
-    public void prependTransform (NSAffineTransform transform)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_prependTransform_1, transform !is null ? transform.id_ : null);
-    }
+public void prependTransform (NSAffineTransform transform)
+{
+    OS.objc_msgSend(this.id, OS.sel_prependTransform_1, transform !is null ? transform.id : null);
+}
 
-    public void rotateByDegrees (CGFloat angle)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_rotateByDegrees_1, angle);
-    }
+
+public void rotateByDegrees(float /*double*/ angle) {
+    OS.objc_msgSend(this.id, OS.sel_rotateByDegrees_, angle);
+}
 
-    public void rotateByRadians (CGFloat angle)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_rotateByRadians_1, angle);
-    }
+public void scaleXBy(float /*double*/ scaleX, float /*double*/ scaleY) {
+    OS.objc_msgSend(this.id, OS.sel_scaleXBy_yBy_, scaleX, scaleY);
+}
 
-    public void scaleBy (CGFloat scale)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_scaleBy_1, scale);
-    }
+public void set() {
+    OS.objc_msgSend(this.id, OS.sel_set);
+}
 
-    public void scaleXBy (CGFloat scaleX, CGFloat scaleY)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_scaleXBy_1yBy_1, scaleX, scaleY);
-    }
+public void setTransformStruct (NSAffineTransformStruct transformStruct)
+{
+    OS.objc_msgSend(this.id, OS.sel_setTransformStruct_1, transformStruct);
+}
 
-    public void setTransformStruct (NSAffineTransformStruct transformStruct)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_setTransformStruct_1, transformStruct);
-    }
-
-    public static NSAffineTransform transform ()
-    {
-        objc.id result = OS.objc_msgSend(OS.class_NSAffineTransform, OS.sel_transform);
-        return result !is null ? new NSAffineTransform(result) : null;
-    }
+public static NSAffineTransform transform ()
+{
+    objc.id result = OS.objc_msgSend(OS.class_NSAffineTransform, OS.sel_transform);
+    return result !is null ? new NSAffineTransform(result) : null;
+}
 
-    public NSPoint transformPoint (NSPoint aPoint)
-    {
-        NSPoint result;
-        OS.objc_msgSend_stret(&result, this.id_, OS.sel_transformPoint_1, aPoint);
-        return result;
-    }
+public NSPoint transformPoint (NSPoint aPoint)
+{
+    NSPoint result;
+    OS.objc_msgSend_stret(result, this.id, OS.sel_transformPoint_1, aPoint);
+    return result;
+}
 
-    public NSSize transformSize (NSSize aSize)
-    {
-        NSSize result;
-        OS.objc_msgSend_stret(&result, this.id_, OS.sel_transformSize_1, aSize);
-        return result;
-    }
+public NSSize transformSize (NSSize aSize)
+{
+    NSSize result;
+    OS.objc_msgSend_stret(result, this.id, OS.sel_transformSize_1, aSize);
+    return result;
+}
 
-    public NSAffineTransformStruct transformStruct ()
-    {
-        NSAffineTransformStruct result;
-        OS.objc_msgSend_stret(&result, this.id_, OS.sel_transformStruct);
-        return result;
-    }
+public NSAffineTransformStruct transformStruct ()
+{
+    NSAffineTransformStruct result;
+    OS.objc_msgSend_stret(result, this.id, OS.sel_transformStruct);
+    return result;
+}
 
-    public void translateXBy (CGFloat deltaX, CGFloat deltaY)
-    {
-        OS.objc_msgSend(this.id_, OS.sel_translateXBy_1yBy_1, deltaX, deltaY);
-    }
+public void translateXBy (CGFloat deltaX, CGFloat deltaY)
+{
+    OS.objc_msgSend(this.id, OS.sel_translateXBy_1yBy_1, deltaX, deltaY);
+}
 
 }