Mercurial > projects > doodle
diff doodle/gtk/conversions.d @ 66:43cc2135ced0
Some code cleanups
author | "David Bryant <bagnose@gmail.com>" |
---|---|
date | Thu, 12 Aug 2010 22:43:42 +0930 |
parents | eb5436b47d13 |
children | 31d10176415d |
line wrap: on
line diff
--- a/doodle/gtk/conversions.d Thu Aug 12 22:24:28 2010 +0930 +++ b/doodle/gtk/conversions.d Thu Aug 12 22:43:42 2010 +0930 @@ -10,14 +10,10 @@ ButtonAction gtk2tkButtonAction(gdk.Event.EventType event_type) { switch (event_type) { - case gdk.Event.EventType.BUTTON_PRESS: - return ButtonAction.SINGLE_PRESS; - case gdk.Event.EventType.DOUBLE_BUTTON_PRESS: - return ButtonAction.DOUBLE_PRESS; - case gdk.Event.EventType.TRIPLE_BUTTON_PRESS: - return ButtonAction.TRIPLE_PRESS; - case gdk.Event.EventType.BUTTON_RELEASE: - return ButtonAction.RELEASE; + case gdk.Event.EventType.BUTTON_PRESS: return ButtonAction.SINGLE_PRESS; + case gdk.Event.EventType.DOUBLE_BUTTON_PRESS: return ButtonAction.DOUBLE_PRESS; + case gdk.Event.EventType.TRIPLE_BUTTON_PRESS: return ButtonAction.TRIPLE_PRESS; + case gdk.Event.EventType.BUTTON_RELEASE: return ButtonAction.RELEASE; default: assert(false); } @@ -25,16 +21,11 @@ ButtonName gtk2tkButtonName(gdk.Event.guint button) { switch (button) { - case 1: - return ButtonName.LEFT; - case 2: - return ButtonName.MIDDLE; - case 3: - return ButtonName.RIGHT; - case 4: - return ButtonName.FOUR; - case 5: - return ButtonName.FIVE; + case 1: return ButtonName.LEFT; + case 2: return ButtonName.MIDDLE; + case 3: return ButtonName.RIGHT; + case 4: return ButtonName.FOUR; + case 5: return ButtonName.FIVE; default: assert(false); } @@ -60,14 +51,10 @@ ScrollDirection gtk2tkDirection(gdk.Event.ScrollDirection direction) { switch (direction) { - case gdk.Event.ScrollDirection.UP: - return ScrollDirection.UP; - case gdk.Event.ScrollDirection.DOWN: - return ScrollDirection.DOWN; - case gdk.Event.ScrollDirection.LEFT: - return ScrollDirection.LEFT; - case gdk.Event.ScrollDirection.RIGHT: - return ScrollDirection.RIGHT; + case gdk.Event.ScrollDirection.UP: return ScrollDirection.UP; + case gdk.Event.ScrollDirection.DOWN: return ScrollDirection.DOWN; + case gdk.Event.ScrollDirection.LEFT: return ScrollDirection.LEFT; + case gdk.Event.ScrollDirection.RIGHT: return ScrollDirection.RIGHT; default: assert(false); } @@ -75,18 +62,12 @@ CrossingMode gtk2tkCrossingMode(gdk.Event.CrossingMode crossingMode) { switch (crossingMode) { - case crossingMode.NORMAL: - return CrossingMode.NORMAL; - case crossingMode.GRAB: - return CrossingMode.GRAB; - case crossingMode.UNGRAB: - return CrossingMode.UNGRAB; - case crossingMode.GTK_GRAB: - return CrossingMode.GRAB2; - case crossingMode.GTK_UNGRAB: - return CrossingMode.UNGRAB2; - case crossingMode.STATE_CHANGED: - return CrossingMode.STATE_CHANGED; + case crossingMode.NORMAL: return CrossingMode.NORMAL; + case crossingMode.GRAB: return CrossingMode.GRAB; + case crossingMode.UNGRAB: return CrossingMode.UNGRAB; + case crossingMode.GTK_GRAB: return CrossingMode.GRAB2; + case crossingMode.GTK_UNGRAB: return CrossingMode.UNGRAB2; + case crossingMode.STATE_CHANGED: return CrossingMode.STATE_CHANGED; default: assert(false); }