Mercurial > projects > doodle

comparison tk/gtk_support.d @ 16:9e63308b749c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Fix up public/private includes * Make Mask a struct
author David Bryant <daveb@acres.com.au>
date Mon, 13 Jul 2009 16:16:17 +0930
parents f0ade1b49fe7
children
comparison
equal deleted inserted replaced
15:2f79aab4d385 16:9e63308b749c
1 module tk.gtk_support; 1 module tk.gtk_support;
2 2
3 import tk.types; 3 public {
4 import tk.types;
5 }
4 6
5 static import gdk.Event; 7 private {
8 static import gdk.Event;
9 }
6 10
7 ButtonAction gtk2tk_button_action(gdk.Event.EventType event_type) { 11 ButtonAction gtk2tk_button_action(gdk.Event.EventType event_type) {
8 switch (event_type) { 12 switch (event_type) {
9 case gdk.Event.EventType.BUTTON_PRESS: 13 case gdk.Event.EventType.BUTTON_PRESS:
10 return ButtonAction.SINGLE_PRESS; 14 return ButtonAction.SINGLE_PRESS;
47 if (state & gdk.Event.GdkModifierType.BUTTON2_MASK) modifiers ~= Modifier.MIDDLE_BUTTON; 51 if (state & gdk.Event.GdkModifierType.BUTTON2_MASK) modifiers ~= Modifier.MIDDLE_BUTTON;
48 if (state & gdk.Event.GdkModifierType.BUTTON3_MASK) modifiers ~= Modifier.RIGHT_BUTTON; 52 if (state & gdk.Event.GdkModifierType.BUTTON3_MASK) modifiers ~= Modifier.RIGHT_BUTTON;
49 if (state & gdk.Event.GdkModifierType.BUTTON4_MASK) modifiers ~= Modifier.UNUSED_BUTTON_1; 53 if (state & gdk.Event.GdkModifierType.BUTTON4_MASK) modifiers ~= Modifier.UNUSED_BUTTON_1;
50 if (state & gdk.Event.GdkModifierType.BUTTON5_MASK) modifiers ~= Modifier.UNUSED_BUTTON_2; 54 if (state & gdk.Event.GdkModifierType.BUTTON5_MASK) modifiers ~= Modifier.UNUSED_BUTTON_2;
51 55
52 return new Mask(modifiers); 56 Mask m = Mask(modifiers);
57
58 return Mask(modifiers);
53 } 59 }
54 60
55 ScrollDirection gtk2tk_direction(gdk.Event.ScrollDirection direction) { 61 ScrollDirection gtk2tk_direction(gdk.Event.ScrollDirection direction) {
56 switch (direction) { 62 switch (direction) {
57 case gdk.Event.ScrollDirection.UP: 63 case gdk.Event.ScrollDirection.UP: