diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-08-13 21:26:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-13 21:26:15 +0200 |
| commit | 139e621338c7ba1fe03a86d6f2bee9ed1fb97a3b (patch) | |
| tree | 1de6e6d1a977b165ee1cb6dc23b551be329b8bfe /platform/haiku/haiku_direct_window.h | |
| parent | 369e54603ef8a9a02b7a2ebfffade0648402c5ca (diff) | |
| parent | a294a842cb85f86cdd69b6e902aef01c9721668b (diff) | |
Merge pull request #20913 from pulkomandy/master
Rebase patches for fixing haiku build.
Diffstat (limited to 'platform/haiku/haiku_direct_window.h')
| -rw-r--r-- | platform/haiku/haiku_direct_window.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/haiku/haiku_direct_window.h b/platform/haiku/haiku_direct_window.h index 55c2f5fccc..eee09191fa 100644 --- a/platform/haiku/haiku_direct_window.h +++ b/platform/haiku/haiku_direct_window.h @@ -31,9 +31,10 @@ #ifndef HAIKU_DIRECT_WINDOW_H #define HAIKU_DIRECT_WINDOW_H -#include <DirectWindow.h> #include <kernel/image.h> // needed for image_id +#include <DirectWindow.h> + #include "core/os/os.h" #include "main/input_default.h" @@ -63,7 +64,7 @@ private: void HandleWindowResized(BMessage *message); void HandleKeyboardEvent(BMessage *message); void HandleKeyboardModifierEvent(BMessage *message); - inline InputModifierState GetKeyModifierState(uint32 p_state); + inline void GetKeyModifierState(Ref<InputEventWithModifiers> event, uint32 p_state); inline int GetMouseButtonState(uint32 p_state); public: |