--- a/doodle/gtk/canvas.d	Sun Aug 15 01:36:22 2010 +0930
+++ b/doodle/gtk/canvas.d	Sun Aug 15 15:19:14 2010 +0930
@@ -299,39 +299,27 @@
 
         bool onButtonPress(GdkEventButton * event, Widget widget) {
             assert(widget is _drawingArea);
-
-            auto buttonEvent = makeButtonEvent(event, _screenModel);
-            _eventHandler.handleButtonPress(this, buttonEvent);
+            _eventHandler.handleButtonPress(this, makeButtonEvent(event, _screenModel));
             fixDamage;
             return true;
         }
 
         bool onButtonRelease(GdkEventButton * event, Widget widget) {
             assert(widget is _drawingArea);
-
-            auto buttonEvent = makeButtonEvent(event, _screenModel);
-            _eventHandler.handleButtonRelease(this, buttonEvent);
+            _eventHandler.handleButtonRelease(this, makeButtonEvent(event, _screenModel));
             fixDamage;
             return true;
         }
 
         bool onKeyPressEvent(GdkEventKey * event, Widget widget) {
             assert(widget is _drawingArea);
-
-            auto keyEvent = new KeyEvent(event.string[0..strlen(event.string)].idup,
-                                         event.keyval,
-                                         gtk2tkMask(event.state));
-            message("Got key press %s", keyEvent);
-            _eventHandler.handleKeyPress(this, keyEvent);
-
+            _eventHandler.handleKeyPress(this, makeKeyEvent(event, _screenModel));
             fixDamage;
-
             return true;
         }
 
         bool onKeyReleaseEvent(GdkEventKey * event, Widget widget) {
             assert(widget is _drawingArea);
-
             _eventHandler.handleKeyRelease(this, makeKeyEvent(event, _screenModel));
             fixDamage;
             return true;
@@ -351,7 +339,6 @@
 
         bool onScroll(GdkEventScroll * event, Widget widget) {
             assert(widget is _drawingArea);
-
             _eventHandler.handleScroll(this, makeScrollEvent(event, _screenModel));
             fixDamage;
             return true;
@@ -359,7 +346,6 @@
 
         bool onEnterNotify(GdkEventCrossing * event, Widget widget) {
             assert(widget is _drawingArea);
-
             _eventHandler.handleEnter(this, makeCrossingEvent(event, _screenModel));
             fixDamage;
             return true;
@@ -367,7 +353,6 @@
 
         bool onLeaveNotify(GdkEventCrossing * event, Widget widget) {
             assert(widget is _drawingArea);
-
             _eventHandler.handleLeave(this, makeCrossingEvent(event, _screenModel));
             fixDamage;
             return true;