summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu/uiinput.h
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
committer ImJezze <jezze@gmx.net>2016-02-21 11:48:45 +0100
commitcc24a339d8c0517259084b5c178d784626ba965c (patch)
tree9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/emu/uiinput.h
parentb5daabda5495dea5c50e17961ecfed2ea8619d76 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/emu/uiinput.h')
-rw-r--r--src/emu/uiinput.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/emu/uiinput.h b/src/emu/uiinput.h
index 2e89a0c413a..fecc61c0c1a 100644
--- a/src/emu/uiinput.h
+++ b/src/emu/uiinput.h
@@ -33,6 +33,7 @@ enum ui_event_type
UI_EVENT_MOUSE_DOWN,
UI_EVENT_MOUSE_UP,
UI_EVENT_MOUSE_DOUBLE_CLICK,
+ UI_EVENT_MOUSE_WHEEL,
UI_EVENT_CHAR
};
@@ -44,6 +45,8 @@ struct ui_event
INT32 mouse_y;
input_item_id key;
unicode_char ch;
+ short zdelta;
+ int num_lines;
};
// ======================> ui_input_manager
@@ -85,6 +88,9 @@ public:
void push_mouse_up_event(render_target* target, INT32 x, INT32 y);
void push_mouse_double_click_event(render_target* target, INT32 x, INT32 y);
void push_char_event(render_target* target, unicode_char ch);
+ void push_mouse_wheel_event(render_target *target, INT32 x, INT32 y, short delta, int ucNumLines);
+
+ void mark_all_as_pressed();
private: