--- a/dwt/widgets/Canvas.d	Sun Sep 07 22:19:25 2008 +0200
+++ b/dwt/widgets/Canvas.d	Mon Sep 08 17:38:05 2008 +0200
@@ -7,11 +7,12 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     
+ * Port to the D programming language:
+ *     Jacob Carlborg <jacob.carlborg@gmail.com>
  *******************************************************************************/
 module dwt.widgets.Canvas;
 
-import dwt.dwthelper.utils;
-
 
 import dwt.DWT;
 import dwt.DWTException;
@@ -27,6 +28,12 @@
 import dwt.internal.cocoa.NSSize;
 import dwt.internal.cocoa.OS;
 
+import dwt.dwthelper.utils;
+import dwt.widgets.Caret;
+import dwt.widgets.Composite;
+import dwt.widgets.Control;
+import dwt.widgets.IME;
+
 /**
  * Instances of this class provide a surface for drawing
  * arbitrary graphics.
@@ -137,18 +144,18 @@
         
         Image image = caret.image;
         if (image !is null) {
-            NSRect fromRect = new NSRect ();
+            NSRect fromRect = NSRect ();
             NSSize size = image.handle.size();
             fromRect.width = size.width;
             fromRect.height = size.height;
-            NSPoint point = new NSPoint();
+            NSPoint point = NSPoint();
             point.x = caret.x;
             point.y = caret.y;
             image.handle.drawAtPoint(point, rect, OS.NSCompositeXOR, 1);
         } else {
             context.saveGraphicsState();
             context.setCompositingOperation(OS.NSCompositeXOR);
-            NSRect drawRect = new NSRect();
+            NSRect drawRect = NSRect();
             drawRect.x = caret.x;
             drawRect.y = caret.y;
             drawRect.width = caret.width !is 0 ? caret.width : Caret.DEFAULT_WIDTH;
@@ -251,7 +258,7 @@
     if (sourceRect.intersects (clientRect)) {
         update (all);
     }
-    NSRect damage = new NSRect();
+    NSRect damage = NSRect();
     damage.x = x;
     damage.y = y;
     damage.width = width;