--- a/doodle/dia/tool_layer.d	Sun Aug 08 21:56:54 2010 +0930
+++ b/doodle/dia/tool_layer.d	Sun Aug 08 22:01:54 2010 +0930
@@ -9,10 +9,10 @@
     import doodle.cairo.routines;
 }
 
-interface ToolStack {
+interface IToolStack {
 }
 
-class ToolLayer : Layer, EventHandler, ToolStack {
+class ToolLayer : Layer, IEventHandler, IToolStack {
     this(in Tool[] tools, in string name) {
         super(name);
         _tools = tools.dup;
@@ -24,7 +24,7 @@
         return Rectangle();
     }
 
-    override void draw(const Viewport viewport,
+    override void draw(const IViewport viewport,
                        in Rectangle pixelDamage, scope Context pixelCr,
                        in Rectangle modelDamage, scope Context modelCr) const {
         if (_grabbedTool) {
@@ -34,7 +34,7 @@
 
     // EventHandler overrides:
 
-    override bool handleButtonPress(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonPress(scope IViewport viewport, in ButtonEvent event) {
         // writefln("%s", event);
 
         if (_grabbedTool is null) {
@@ -53,7 +53,7 @@
         return true;
     }
 
-    override bool handleButtonRelease(scope Viewport viewport, in ButtonEvent event) {
+    override bool handleButtonRelease(scope IViewport viewport, in ButtonEvent event) {
         // writefln("%s", event);
 
         if (_grabbedTool !is null) {
@@ -67,19 +67,19 @@
         return true;
     }
 
-    override bool handleKeyPress(scope Viewport viewport, in KeyEvent event) {
+    override bool handleKeyPress(scope IViewport viewport, in KeyEvent event) {
         // writefln("%s", event);
 
         return true;
     }
 
-    override bool handleKeyRelease(scope Viewport viewport, in KeyEvent event) {
+    override bool handleKeyRelease(scope IViewport viewport, in KeyEvent event) {
         // writefln("%s", event);
 
         return true;
     }
 
-    override bool handleMotion(scope Viewport viewport, in MotionEvent event) {
+    override bool handleMotion(scope IViewport viewport, in MotionEvent event) {
         //writefln("%s", event);
 
         if (_grabbedTool is null) {
@@ -96,7 +96,7 @@
         return true;
     }
 
-    override bool handleScroll(scope Viewport viewport, in ScrollEvent event) {
+    override bool handleScroll(scope IViewport viewport, in ScrollEvent event) {
         // writefln("%s", event);
 
         if (_grabbedTool is null) {