--- a/tk/types.d	Sat Jul 11 20:44:14 2009 +0930
+++ b/tk/types.d	Sat Jul 11 21:29:03 2009 +0930
@@ -4,15 +4,15 @@
 private import std.typecons;
 private import std.algorithm;
 
-mixin(defineEnum!("ButtonPress",
-                  "SINGLE", "DOUBLE", "TRIPLE", "RELEASE"));
-mixin(defineEnum!("ButtonNumber",
-                  "BUTTON_1", "BUTTON_2", "BUTTON_3", "BUTTON_4", "BUTTON_5"));
+mixin(defineEnum!("ButtonAction",
+                  "PRESS_SINGLE", "PRESS_DOUBLE", "PRESS_TRIPLE", "RELEASE"));
+mixin(defineEnum!("ButtonName",
+                  "LEFT", "MIDDLE", "RIGHT", "FOUR", "FIVE"));
 mixin(defineEnum!("ScrollDirection",
                   "UP", "DOWN", "LEFT", "RIGHT"));
 mixin(defineEnum!("Modifier",
                   "SHIFT", "CAPS_LOCK", "CONTROL", "ALT", "NUM_LOCK", "META",
-                  "SCROLL_LOCK", "BUTTON_1", "BUTTON_2", "BUTTON_3", "BUTTON_4", "BUTTON_5"));
+                  "SCROLL_LOCK", "BUTTON_LEFT", "BUTTON_MIDDLE", "BUTTON_RIGHT", "BUTTON_FOUR", "BUTTON_FIVE"));
 
 class Mask {
     this(in Modifier[] modifiers) {
@@ -48,28 +48,3 @@
         Modifier[] _modifiers;
     }
 }
-
-/*
-class Mask {
-    this() {
-    }
-
-    this(in Mask other) {
-        mBits = other.mBits;
-    }
-
-    void add(Modifier modifier) { mBits |= to_bit(modifier); }
-    void remove(Modifier modifier) { mBits &= ~to_bit(modifier); }
-    bool query(Modifier modifier) const { return cast(bool)(mBits & to_bit(modifier)); }
-
-    override string toString() const {
-        Modifier m = Modifier.SHIFT;
-        return enumToString(m);
-    }
-
-    private {
-        static int to_bit(Modifier modifier) { return 1 << cast(int)modifier; }
-        int mBits;
-    }
-}
-*/