From ca39070ca0853128c1a718cc18b8d9cc7ecb9fa4 Mon Sep 17 00:00:00 2001 From: omar Date: Wed, 28 Mar 2018 23:32:02 +0200 Subject: [PATCH] Examples: Win32: Fixes for MingW which doesn't support a 2007 define? I have no idea why people still use MingW (#1704, #1463) --- examples/directx10_example/imgui_impl_dx10.cpp | 5 +++++ examples/directx11_example/imgui_impl_dx11.cpp | 5 +++++ examples/directx12_example/imgui_impl_dx12.cpp | 5 +++++ examples/directx9_example/imgui_impl_dx9.cpp | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/examples/directx10_example/imgui_impl_dx10.cpp b/examples/directx10_example/imgui_impl_dx10.cpp index cc2ebddb..60c79d52 100644 --- a/examples/directx10_example/imgui_impl_dx10.cpp +++ b/examples/directx10_example/imgui_impl_dx10.cpp @@ -275,6 +275,11 @@ static bool ImGui_ImplWin32_UpdateMouseCursor() return true; } +// MingW (which is stuck in the past) doesn't have this Vista-era define.. +#ifndef WM_MOUSEHWHEEL +#define WM_MOUSEHWHEEL 0x020E +#endif + // Process Win32 mouse/keyboard inputs. // You can read the io.WantCaptureMouse, io.WantCaptureKeyboard flags to tell if dear imgui wants to use your inputs. // - When io.WantCaptureMouse is true, do not dispatch mouse input data to your main application. diff --git a/examples/directx11_example/imgui_impl_dx11.cpp b/examples/directx11_example/imgui_impl_dx11.cpp index a9748eea..f319d2c4 100644 --- a/examples/directx11_example/imgui_impl_dx11.cpp +++ b/examples/directx11_example/imgui_impl_dx11.cpp @@ -282,6 +282,11 @@ static bool ImGui_ImplWin32_UpdateMouseCursor() return true; } +// MingW (which is stuck in the past) doesn't have this Vista-era define.. +#ifndef WM_MOUSEHWHEEL +#define WM_MOUSEHWHEEL 0x020E +#endif + // Process Win32 mouse/keyboard inputs. // You can read the io.WantCaptureMouse, io.WantCaptureKeyboard flags to tell if dear imgui wants to use your inputs. // - When io.WantCaptureMouse is true, do not dispatch mouse input data to your main application. diff --git a/examples/directx12_example/imgui_impl_dx12.cpp b/examples/directx12_example/imgui_impl_dx12.cpp index a6f36f6f..04df1dbc 100644 --- a/examples/directx12_example/imgui_impl_dx12.cpp +++ b/examples/directx12_example/imgui_impl_dx12.cpp @@ -253,6 +253,11 @@ static bool ImGui_ImplWin32_UpdateMouseCursor() return true; } +// MingW (which is stuck in the past) doesn't have this Vista-era define.. +#ifndef WM_MOUSEHWHEEL +#define WM_MOUSEHWHEEL 0x020E +#endif + // Process Win32 mouse/keyboard inputs. // You can read the io.WantCaptureMouse, io.WantCaptureKeyboard flags to tell if dear imgui wants to use your inputs. // - When io.WantCaptureMouse is true, do not dispatch mouse input data to your main application. diff --git a/examples/directx9_example/imgui_impl_dx9.cpp b/examples/directx9_example/imgui_impl_dx9.cpp index 1c1bb1c0..aa40d34a 100644 --- a/examples/directx9_example/imgui_impl_dx9.cpp +++ b/examples/directx9_example/imgui_impl_dx9.cpp @@ -215,6 +215,11 @@ static bool ImGui_ImplWin32_UpdateMouseCursor() return true; } +// MingW (which is stuck in the past) doesn't have this Vista-era define.. +#ifndef WM_MOUSEHWHEEL +#define WM_MOUSEHWHEEL 0x020E +#endif + // Process Win32 mouse/keyboard inputs. // You can read the io.WantCaptureMouse, io.WantCaptureKeyboard flags to tell if dear imgui wants to use your inputs. // - When io.WantCaptureMouse is true, do not dispatch mouse input data to your main application.