--- a/doodle/gtk/canvas.d	Sun Aug 15 23:43:04 2010 +0930
+++ b/doodle/gtk/canvas.d	Mon Aug 16 00:04:27 2010 +0930
@@ -3,17 +3,17 @@
 public {
     import doodle.dia.icanvas;
     import doodle.gtk.events;
-    import doodle.gtk.cairo;
 }
 
 private {
     import doodle.core.logging;
-    import doodle.tk.pixel_model;
-    import doodle.tk.cairo;
+    import doodle.tk.screen_model;
     import doodle.dia.layer_stack;
     import doodle.gtk.conversions;
+    import doodle.gtk.cairo;
 
     import cairo.Surface;
+    import cairo.Context;
 
     import gtk.Widget;
     import gtk.Toolbar;
@@ -70,13 +70,13 @@
         _drawingArea.addOnRealize(&onRealize);
         _drawingArea.addOnConfigure(&onConfigure);
         _drawingArea.addOnExpose(&onExpose);
-        _drawingArea.addOnButtonPress(&onButtonPress);              // FIXME merge delegate with next
+        _drawingArea.addOnButtonPress(&onButtonPress);
         _drawingArea.addOnButtonRelease(&onButtonRelease);
-        _drawingArea.addOnKeyPress(&onKeyPressEvent);               // FIXME merge delegate with next
+        _drawingArea.addOnKeyPress(&onKeyPressEvent);
         _drawingArea.addOnKeyRelease(&onKeyReleaseEvent);
         _drawingArea.addOnMotionNotify(&onMotionNotify);
         _drawingArea.addOnScroll(&onScroll);
-        _drawingArea.addOnEnterNotify(&onEnterNotify);              // FIXME merge delegate with next
+        _drawingArea.addOnEnterNotify(&onEnterNotify);
         _drawingArea.addOnLeaveNotify(&onLeaveNotify);
 
         _drawingArea.addOnFocusIn(&onFocusIn);
@@ -234,7 +234,7 @@
                     immutable Point viewLeftBottom = _screenModel.screenToModel(Point(0.0, 0.0));
                     modelCr.translate(-viewLeftBottom.x, -viewLeftBottom.y);
 
-                    rectangle(modelCr, modelDamage);
+                    modelCr.rectangle(modelDamage.x0, modelDamage.y0, modelDamage.w, modelDamage.h);
                     modelCr.clip;
                 }
 
@@ -243,14 +243,14 @@
                     screenCr.translate(0.0, _screenModel.viewBoundsScreen.h);
                     screenCr.scale(1.0, -1.0);
 
-                    rectangle(screenCr, screenDamage);
+                    screenCr.rectangle(screenDamage.x0, screenDamage.y0, screenDamage.w, screenDamage.h);
                     screenCr.clip;
                 }
 
                 screenCr.save; {
                     // Fill the background with light grey
                     screenCr.setSourceRgba(0.9, 0.9, 0.9, 1.0);
-                    rectangle(screenCr, screenDamage);
+                    screenCr.rectangle(screenDamage.x0, screenDamage.y0, screenDamage.w, screenDamage.h);
                     screenCr.fill;
                 } screenCr.restore;
 
@@ -368,7 +368,7 @@
             immutable Point viewRightTop = _screenModel.screenToModel(_screenModel.viewBoundsScreen.corner1);
 
             // Define these just to obtain the position
-            // below and we can preserve it
+            // below so we can preserve it
             double lower, upper, position, maxSize;
 
             _hRuler.getRange(lower, upper, position, maxSize);
@@ -437,8 +437,6 @@
         double        _pixelsPerMillimetre;
         LayerStack    _layerStack;
 
-        immutable CursorType[Cursor] _cursors;
-
         // Child widgets:
         HRuler        _hRuler;
         VRuler        _vRuler;
@@ -450,5 +448,7 @@
 
         Rectangle     _damageScreen;
         ScreenModel   _screenModel;
+
+        immutable CursorType[Cursor] _cursors;
     }
 }