diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-05-23 14:38:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 14:38:35 +0200 |
| commit | 5b0ecc9ad3d716d41f2d352cd758ac68cbce7f35 (patch) | |
| tree | 5089c31f052e669b15d15a498b5d0b88f40640ef /platform/windows | |
| parent | afcce9eb12a6163e8052aafe8351515313e76847 (diff) | |
| parent | 8b01f9d28ffccb21db04867d1265f0be9d40aa53 (diff) | |
Merge pull request #8876 from BastiaanOlij/fix_vs15
Fix a few issues compiling windows and using VS2015 and earlier
Diffstat (limited to 'platform/windows')
| -rw-r--r-- | platform/windows/os_windows.cpp | 2 | ||||
| -rw-r--r-- | platform/windows/os_windows.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index ba5db05dab..830aae5515 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -565,7 +565,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ScreenToClient(hWnd, &coords); - mb->set_pos(coords); + mb->set_pos(Vector2(coords.x, coords.y)); } if (main_loop) { diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index bd5acde417..6cbdd58830 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -68,8 +68,7 @@ class OS_Windows : public OS { struct KeyEvent { - InputModifierState mod_state; - bool alt, shift, ctrl, meta; + bool alt, shift, control, meta; UINT uMsg; WPARAM wParam; LPARAM lParam; |