--- a/dwt/widgets/Canvas.d	Tue Oct 07 12:56:18 2008 +0200
+++ b/dwt/widgets/Canvas.d	Fri Oct 10 12:29:48 2008 +0200
@@ -29,6 +29,7 @@
 import dwt.internal.cocoa.OS;
 
 import dwt.dwthelper.utils;
+import dwt.internal.cocoa.NSImage;
 import dwt.widgets.Caret;
 import dwt.widgets.Composite;
 import dwt.widgets.Control;
@@ -136,7 +137,7 @@
     }
 }
 
-void drawRect(int id, NSRect rect) {
+void drawRect(objc.id id, NSRect rect) {
     super.drawRect(id, rect);
     if (caret is null) return;
     if (caret.isShowing) {
@@ -151,10 +152,10 @@
             NSPoint point = NSPoint();
             point.x = caret.x;
             point.y = caret.y;
-            image.handle.drawAtPoint(point, rect, OS.NSCompositeXOR, 1);
+            image.handle.drawAtPoint(point, rect, NSCompositeXOR, 1);
         } else {
             context.saveGraphicsState();
-            context.setCompositingOperation(OS.NSCompositeXOR);
+            context.setCompositingOperation(NSCompositeXOR);
             NSRect drawRect = NSRect();
             drawRect.x = caret.x;
             drawRect.y = caret.y;