--- a/doodle/gtk/cairo_canvas.d	Thu Jan 12 18:20:58 2012 +1030
+++ b/doodle/gtk/cairo_canvas.d	Thu Aug 02 15:32:43 2012 +0930
@@ -35,7 +35,7 @@
     import std.stdio;
 }
 
-final class CairoCanvas : Table, private IViewport {
+final class CairoCanvas : Table, IViewport {
     static this() {
         _cursors = [
             Cursor.DEFAULT   : CursorType.ARROW,
@@ -146,19 +146,19 @@
 
         void zoomRelative(in double factor, in Point screenDatum) {
             _screenModel.zoomRelative(factor, screenDatum);
-            consolidateBounds;
-            updateAdjustments;
-            updateRulers;
+            consolidateBounds();
+            updateAdjustments();
+            updateRulers();
             _grid.zoomChanged(_screenModel.zoom);
-            queueDraw;
+            queueDraw();
         }
 
         void panRelative(in Vector screenDisplacement) {
             _screenModel.panRelativeScreen(screenDisplacement);
-            consolidateBounds;
-            updateAdjustments;
-            updateRulers;
-            queueDraw;
+            consolidateBounds();
+            updateAdjustments();
+            updateRulers();
+            queueDraw();
         }
 
         void setCursor(in Cursor cursor) {
@@ -181,8 +181,8 @@
             Rectangle paddedLayerBounds = growCentre(layerBounds, 2 * layerBounds.size);
             _screenModel.consolidateCanvasBounds(paddedLayerBounds);
 
-            updateAdjustments;
-            updateRulers;
+            updateAdjustments();
+            updateRulers();
         }
 
         bool onConfigure(GdkEventConfigure * event, Widget widget) {
@@ -196,12 +196,12 @@
                 _screenModel = new ScreenModel(0.25 * _pixelsPerMillimetre, paddedLayerBounds, viewBoundsScreen);
                 _grid.zoomChanged(_screenModel.zoom);
 
-                updateAdjustments;
-                updateRulers;
+                updateAdjustments();
+                updateRulers();
             }
             else {
                 _screenModel.setViewBoundsScreen(viewBoundsScreen);
-                consolidateBounds;
+                consolidateBounds();
             }
 
             return true;
@@ -210,7 +210,7 @@
         bool onExpose(GdkEventExpose * event, Widget widget) {
             assert(widget is _drawingArea);
 
-            auto dr = _drawingArea.getWindow;
+            auto dr = _drawingArea.getWindow();
             scope modelCr = new Context(dr);            // Causing a memory leak!
             scope screenCr = new Context(dr);           // Causing a memory leak!
 
@@ -221,7 +221,7 @@
 
             Rectangle modelDamage = _screenModel.screenToModel(screenDamage);
 
-            modelCr.save; screenCr.save; {
+            modelCr.save(); screenCr.save(); {
                 {
                     // Setup model context and clip
                     modelCr.translate(0.0, _screenModel.viewBoundsScreen.h);
@@ -231,7 +231,7 @@
                     modelCr.translate(-viewLeftBottom.x, -viewLeftBottom.y);
 
                     modelCr.rectangle(modelDamage.x0, modelDamage.y0, modelDamage.w, modelDamage.h);
-                    modelCr.clip;
+                    modelCr.clip();
                 }
 
                 {
@@ -240,20 +240,20 @@
                     screenCr.scale(1.0, -1.0);
 
                     screenCr.rectangle(screenDamage.x0, screenDamage.y0, screenDamage.w, screenDamage.h);
-                    screenCr.clip;
+                    screenCr.clip();
                 }
 
-                screenCr.save; {
+                screenCr.save(); {
                     // Fill the background with light grey
                     screenCr.setSourceRgba(0.9, 0.9, 0.9, 1.0);
                     screenCr.rectangle(screenDamage.x0, screenDamage.y0, screenDamage.w, screenDamage.h);
-                    screenCr.fill;
-                } screenCr.restore;
+                    screenCr.fill();
+                } screenCr.restore();
 
                 _layerStack.draw(screenDamage, new CairoRenderer(screenCr),
                                  modelDamage, new CairoRenderer(modelCr),
                                  _screenModel);
-            } screenCr.restore; modelCr.restore;
+            } screenCr.restore(); modelCr.restore();
 
             return true;
         }
@@ -261,28 +261,28 @@
         bool onButtonPress(GdkEventButton * event, Widget widget) {
             assert(widget is _drawingArea);
             _eventHandler.handleButtonPress(this, makeButtonEvent(event, _screenModel));
-            fixDamage;
+            fixDamage();
             return true;
         }
 
         bool onButtonRelease(GdkEventButton * event, Widget widget) {
             assert(widget is _drawingArea);
             _eventHandler.handleButtonRelease(this, makeButtonEvent(event, _screenModel));
-            fixDamage;
+            fixDamage();
             return true;
         }
 
         bool onKeyPressEvent(GdkEventKey * event, Widget widget) {
             assert(widget is _drawingArea);
             _eventHandler.handleKeyPress(this, makeKeyEvent(event, _screenModel));
-            fixDamage;
+            fixDamage();
             return true;
         }
 
         bool onKeyReleaseEvent(GdkEventKey * event, Widget widget) {
             assert(widget is _drawingArea);
             _eventHandler.handleKeyRelease(this, makeKeyEvent(event, _screenModel));
-            fixDamage;
+            fixDamage();
             return true;
         }
 
@@ -294,28 +294,28 @@
             gtk_widget_event(_vRuler.getWidgetStruct(), cast(GdkEvent *)event);
 
             _eventHandler.handleMotion(this, makeMotionEvent(event, _screenModel));
-            fixDamage;
+            fixDamage();
             return true;
         }
 
         bool onScroll(GdkEventScroll * event, Widget widget) {
             assert(widget is _drawingArea);
             _eventHandler.handleScroll(this, makeScrollEvent(event, _screenModel));
-            fixDamage;
+            fixDamage();
             return true;
         }
 
         bool onEnterNotify(GdkEventCrossing * event, Widget widget) {
             assert(widget is _drawingArea);
             _eventHandler.handleEnter(this, makeCrossingEvent(event, _screenModel));
-            fixDamage;
+            fixDamage();
             return true;
         }
 
         bool onLeaveNotify(GdkEventCrossing * event, Widget widget) {
             assert(widget is _drawingArea);
             _eventHandler.handleLeave(this, makeCrossingEvent(event, _screenModel));
-            fixDamage;
+            fixDamage();
             return true;
         }
 
@@ -347,8 +347,8 @@
         }
 
         void onAdjustmentValueChanged(Adjustment adjustment) {
-            GtkAdjustment * hGtkAdjustment = _hAdjustment.getAdjustmentStruct;
-            GtkAdjustment * vGtkAdjustment = _vAdjustment.getAdjustmentStruct;
+            GtkAdjustment * hGtkAdjustment = _hAdjustment.getAdjustmentStruct();
+            GtkAdjustment * vGtkAdjustment = _vAdjustment.getAdjustmentStruct();
 
             Point oldViewLeftBottom = _screenModel.screenToModel(Point(0.0, 0.0));
             Point newViewLeftBottom = Point(gtk_adjustment_get_value(hGtkAdjustment),
@@ -356,8 +356,8 @@
 
             _screenModel.panRelativeModel(newViewLeftBottom - oldViewLeftBottom);
 
-            updateRulers;
-            queueDraw;
+            updateRulers();
+            queueDraw();
         }
 
         void updateRulers() {