--- a/doodle/tk/events.d	Mon Oct 18 18:10:02 2010 +1030
+++ b/doodle/tk/events.d	Thu Oct 28 16:35:11 2010 +1030
@@ -7,25 +7,16 @@
 }
 
 private {
-    import std.typecons;
+    import std.conv;
 }
 
-mixin(defineEnum!("ButtonAction",
-                  "SINGLE_PRESS", "DOUBLE_PRESS", "TRIPLE_PRESS", "RELEASE"));
-
-mixin(defineEnum!("ButtonName",
-                  "LEFT", "MIDDLE", "RIGHT", "FOUR", "FIVE"));
+enum ButtonAction { SINGLE_PRESS, DOUBLE_PRESS, TRIPLE_PRESS, RELEASE }
+enum ButtonName { LEFT, MIDDLE, RIGHT, FOUR, FIVE }
+enum ScrollDirection { UP, DOWN, LEFT, RIGHT }
+enum Modifier { SHIFT, CAPS_LOCK, CONTROL, ALT, NUM_LOCK, META, SCROLL_LOCK, LEFT_BUTTON, MIDDLE_BUTTON, RIGHT_BUTTON, UNUSED_BUTTON_1, UNUSED_BUTTON_2 }
 
-mixin(defineEnum!("ScrollDirection",
-                  "UP", "DOWN", "LEFT", "RIGHT"));
-
-mixin(defineEnum!("Modifier",
-                  "SHIFT", "CAPS_LOCK", "CONTROL", "ALT", "NUM_LOCK", "META",
-                  "SCROLL_LOCK", "LEFT_BUTTON", "MIDDLE_BUTTON", "RIGHT_BUTTON",
-                  "UNUSED_BUTTON_1", "UNUSED_BUTTON_2"));
-
-mixin(defineEnum!("CrossingMode",           // FIXME what to do about GRAB2/UNGRAB2
-                  "NORMAL", "GRAB", "UNGRAB", "GRAB2", "UNGRAB2", "STATE_CHANGED"));
+// FIXME what to do about GRAB2/UNGRAB2
+enum CrossingMode { NORMAL, GRAB, UNGRAB, GRAB2, UNGRAB2, STATE_CHANGED }
 
 struct Mask {
     this(in Modifier[] modifiers) {
@@ -44,7 +35,7 @@
             for (int i = 0; i < _bits.sizeof * 8; ++i) {
                 if (_bits & (1 << i)) {
                     if (s.length != 0) s ~= "|";
-                    s ~= enumToString(cast(Modifier)i);
+                    s ~= to!string(cast(Modifier)i);
                 }
             }
 
@@ -85,7 +76,8 @@
     uint value() const { return _value; }
 
     override string toString() const {
-        return std.string.format("Key event: %s, %d, %s", _str, _value, _mask);
+        return std.string.format("Key event: %s, %d, %s",
+                                 _str, _value, _mask);
     }
 
     private {
@@ -122,7 +114,8 @@
     CrossingMode crossingMode() const { return _crossingMode; }
 
     override string toString() const {
-        return std.string.format("Crossing event: %s, %s, %s, %s", enumToString(_crossingMode), screenPoint, modelPoint, mask);
+        return std.string.format("Crossing event: %s, %s, %s, %s",
+                                 to!string(_crossingMode), screenPoint, modelPoint, mask);
     }
 
     private {
@@ -143,8 +136,7 @@
 
     override string toString() const {
         return std.string.format("Button event: %s, %s, %s, %s, %s",
-                                 enumToString(_buttonAction), enumToString(_buttonName),
-                                 _screenPoint, _modelPoint, _mask);
+                                 to!string(_buttonAction), to!string(_buttonName), _screenPoint, _modelPoint, _mask);
     }
 
     ButtonAction buttonAction() const { return _buttonAction; }
@@ -180,7 +172,7 @@
 
     override string toString() const {
         return std.string.format("Scroll event: %s, %s, %s, %s",
-                                 enumToString(_scrollDirection), _screenPoint, _modelPoint, _mask);
+                                 to!string(_scrollDirection), _screenPoint, _modelPoint, _mask);
     }
 
     ScrollDirection scrollDirection() const { return _scrollDirection; }