--- a/tk/events.d	Sat Jul 11 21:29:03 2009 +0930
+++ b/tk/events.d	Sat Jul 11 21:49:04 2009 +0930
@@ -56,7 +56,7 @@
     string str() const { return mStr; }
 
     override string toString() const {
-        return std.string.format("Key event: %s, %d", mStr, mValue);
+        return std.string.format("Key event: %s, %d, %s", mStr, mValue, mMask);
     }
 
     private {
@@ -93,7 +93,9 @@
     }
 
     override string toString() const {
-        return std.string.format("Button event: %s, %s, %s, %s, %s", mButtonAction, mButtonName, mScreenPoint, mModelPoint, mMask);
+        return std.string.format("Button event: %s, %s, %s, %s, %s",
+                                 enumToString(mButtonAction), enumToString(mButtonName),
+                                 mScreenPoint, mModelPoint, mMask);
     }
 
     ButtonAction button_action() const { return mButtonAction; }
@@ -113,7 +115,8 @@
     }
 
     override string toString() const {
-        return std.string.format("Motion event: %s, %s, %s", mScreenPoint, mModelPoint, mMask);
+        return std.string.format("Motion event: %s, %s, %s",
+                                 mScreenPoint, mModelPoint, mMask);
     }
 }
 
@@ -127,7 +130,8 @@
     }
 
     override string toString() const {
-        return std.string.format("Scroll event: %s, %s, %s, %s", mScrollDirection, mScreenPoint, mModelPoint, mMask);
+        return std.string.format("Scroll event: %s, %s, %s, %s",
+                                 enumToString(mScrollDirection), mScreenPoint, mModelPoint, mMask);
     }
 
     ScrollDirection scroll_direction() const { return mScrollDirection; }