--- a/doodle/dia/icanvas.d	Mon Sep 17 11:49:45 2012 +0930
+++ b/doodle/dia/icanvas.d	Wed Sep 26 17:36:31 2012 +0930
@@ -18,12 +18,12 @@
     PENCIL
 }
 
-interface IViewport2 {
+interface IDamageable {
     void damageModel(in Rectangle area);
     void damageScreen(in Rectangle area);
 }
 
-interface IViewport : IViewport2 {
+interface IViewport : IDamageable {
     void zoomRelative(in double factor, in Point screenDatum);
     void panRelative(in Vector screenDisplacement);
     void setCursor(in Cursor cursor);
@@ -48,8 +48,8 @@
     bool handleKeyRelease(scope IViewport viewport, in KeyEvent event);
 
     // XXX Still not sure about these:
-    //bool handleFocusIn(scope IViewport viewport, FocusEvent event);
-    //bool handleFocusOut(scope IViewport viewport, FocusEvent event);
+    //bool handleFocusIn(scope IViewport viewport, in FocusEvent event);
+    //bool handleFocusOut(scope IViewport viewport, in FocusEvent event);
 }
 
 interface IGrid {