diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-03-27 08:52:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-27 08:52:58 +0200 |
| commit | 9d28a5e7d99e3f089e11a929829443d0a922d030 (patch) | |
| tree | 54ac80623482ce2c6d2cce11d251f9de825c1185 /platform/haiku | |
| parent | fbebd32b5f47b0f8c357bbda3f657c58cdf3e3da (diff) | |
| parent | c0b67568757ccc22811e16348713ef3119e18f3e (diff) | |
| download | redot-engine-9d28a5e7d99e3f089e11a929829443d0a922d030.tar.gz | |
Merge pull request #8159 from Hinsbart/last_id
Input: Remove usage of platform dependent event IDs.
Diffstat (limited to 'platform/haiku')
| -rw-r--r-- | platform/haiku/haiku_direct_window.cpp | 6 | ||||
| -rw-r--r-- | platform/haiku/haiku_direct_window.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/platform/haiku/haiku_direct_window.cpp b/platform/haiku/haiku_direct_window.cpp index 3ed7a84eb5..f64fb706c1 100644 --- a/platform/haiku/haiku_direct_window.cpp +++ b/platform/haiku/haiku_direct_window.cpp @@ -151,7 +151,6 @@ void HaikuDirectWindow::HandleMouseButton(BMessage *message) { */ InputEvent mouse_event; - mouse_event.ID = ++event_id; mouse_event.type = InputEvent::MOUSE_BUTTON; mouse_event.device = 0; @@ -208,7 +207,6 @@ void HaikuDirectWindow::HandleMouseMoved(BMessage *message) { Point2i rel = pos - last_mouse_position; InputEvent motion_event; - motion_event.ID = ++event_id; motion_event.type = InputEvent::MOUSE_MOTION; motion_event.device = 0; @@ -237,7 +235,6 @@ void HaikuDirectWindow::HandleMouseWheelChanged(BMessage *message) { } InputEvent mouse_event; - mouse_event.ID = ++event_id; mouse_event.type = InputEvent::MOUSE_BUTTON; mouse_event.device = 0; @@ -252,7 +249,6 @@ void HaikuDirectWindow::HandleMouseWheelChanged(BMessage *message) { mouse_event.mouse_button.pressed = true; input->parse_input_event(mouse_event); - mouse_event.ID = ++event_id; mouse_event.mouse_button.pressed = false; input->parse_input_event(mouse_event); } @@ -275,7 +271,6 @@ void HaikuDirectWindow::HandleKeyboardEvent(BMessage *message) { } InputEvent event; - event.ID = ++event_id; event.type = InputEvent::KEY; event.device = 0; event.key.mod = GetKeyModifierState(modifiers); @@ -313,7 +308,6 @@ void HaikuDirectWindow::HandleKeyboardModifierEvent(BMessage *message) { int32 key = old_modifiers ^ modifiers; InputEvent event; - event.ID = ++event_id; event.type = InputEvent::KEY; event.device = 0; event.key.mod = GetKeyModifierState(modifiers); diff --git a/platform/haiku/haiku_direct_window.h b/platform/haiku/haiku_direct_window.h index 7fcea7a6f6..d4fd05e45f 100644 --- a/platform/haiku/haiku_direct_window.h +++ b/platform/haiku/haiku_direct_window.h @@ -43,7 +43,6 @@ class HaikuDirectWindow : public BDirectWindow { private: - unsigned int event_id; Point2i last_mouse_position; bool last_mouse_pos_valid; uint32 last_buttons_state; |