--- a/doodle/dia/standard_tools.d	Sun Aug 08 21:56:54 2010 +0930
+++ b/doodle/dia/standard_tools.d	Sun Aug 08 22:01:54 2010 +0930
@@ -11,7 +11,7 @@
 }
 
 final class PanTool : Tool {
-    override bool handleButtonPress(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonPress(scope IViewport viewport, in ButtonEvent event) {
         if (event.button_name == ButtonName.MIDDLE) {
             mLastPosition = event.pixelPoint;
             return true;
@@ -21,7 +21,7 @@
         }
     }
 
-    override bool handleMotion(scope Viewport viewport, in MotionEvent event) {
+    override bool handleMotion(scope IViewport viewport, in MotionEvent event) {
         if (event.mask.isSet(Modifier.MIDDLE_BUTTON)) {
             viewport.panRelative(mLastPosition - event.pixelPoint);
             mLastPosition = event.pixelPoint;
@@ -33,7 +33,7 @@
         }
     }
 
-    override bool handleScroll(scope Viewport viewport, in ScrollEvent event) {
+    override bool handleScroll(scope IViewport viewport, in ScrollEvent event) {
         if (event.mask.isUnset(Modifier.MIDDLE_BUTTON)) {
             Vector delta;
 
@@ -67,7 +67,7 @@
 }
 
 final class ZoomTool : Tool {
-    override bool handleScroll(scope Viewport viewport, in ScrollEvent event) {
+    override bool handleScroll(scope IViewport viewport, in ScrollEvent event) {
         if (event.mask.isSet(Modifier.CONTROL)) {
             if (event.scrollDirection == ScrollDirection.DOWN) {
                 viewport.zoomRelative(event.pixelPoint, 1.0 / ZOOM);
@@ -92,7 +92,7 @@
 }
 
 final class SelectTool : Tool {
-    override bool handleButtonPress(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonPress(scope IViewport viewport, in ButtonEvent event) {
         if (event.button_name == ButtonName.LEFT) {
             _active = true;
             _anchorPoint = _currentPoint = event.pixelPoint;
@@ -104,7 +104,7 @@
         }
     }
 
-    override bool handleButtonRelease(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonRelease(scope IViewport viewport, in ButtonEvent event) {
         if (event.button_name == ButtonName.LEFT && _active) {
             _active = false;
             viewport.damagePixel(feather(Rectangle(_anchorPoint, _currentPoint), LINE_WIDTH / 2.0));
@@ -116,7 +116,7 @@
         }
     }
 
-    override bool handleMotion(scope Viewport viewport, in MotionEvent event) {
+    override bool handleMotion(scope IViewport viewport, in MotionEvent event) {
         if (_active) {
             viewport.damagePixel(feather(Rectangle(_anchorPoint, _currentPoint), LINE_WIDTH / 2.0));
             _currentPoint = event.pixelPoint;
@@ -126,7 +126,7 @@
         return false;
     }
 
-    override void draw(in Viewport viewport,
+    override void draw(in IViewport viewport,
                        in Rectangle pixelDamage, scope Context pixelCr) const {
         if (_active) {
             /*