--- a/icanvas.d	Sat Jul 11 20:44:14 2009 +0930
+++ b/icanvas.d	Sat Jul 11 21:29:03 2009 +0930
@@ -1,20 +1,16 @@
 module icanvas;
 
 import tk.geometry;
+import tk.events;
 
 interface ICanvas {
     void rel_zoom(Point screen_datum, double factor);
     void rel_pan(Vector screen_displacement);
-    //void damage();
 }
 
-import tk.events;
-
 interface ICanvasEventHandler {
     bool handle_button_press(ICanvas canvas, in ButtonEvent event);
     bool handle_button_release(ICanvas canvas, in ButtonEvent event);
-    bool handle_key_press(ICanvas canvas, in KeyEvent event);
-    bool handle_key_release(ICanvas canvas, in KeyEvent event);
     bool handle_motion(ICanvas canvas, in MotionEvent event);
     bool handle_scroll(ICanvas canvas, in ScrollEvent event);
     //bool handle_expose(ICanvas canvas, ExposeEvent event);
@@ -22,4 +18,6 @@
     //bool handle_leave(ICanvas, CrossingEvent event);
     //bool handle_focus_in(ICanvas, FocusEvent event);
     //bool handle_focus_out(ICanvas, FocusEvent event);
+    bool handle_key_press(ICanvas canvas, in KeyEvent event);
+    bool handle_key_release(ICanvas canvas, in KeyEvent event);
 }