From c14a66970b71df8f11086f602df6dd316f5f749f Mon Sep 17 00:00:00 2001 From: omar Date: Mon, 23 Oct 2017 09:57:59 +0200 Subject: [PATCH] Examples: DirectX9/10/11: Renamed WndProc handler to use a generic Win32 name + returning 0 to all messages is more correct. --- .../directx10_example/imgui_impl_dx10.cpp | 24 +++++++++---------- examples/directx10_example/main.cpp | 4 ++-- .../directx11_example/imgui_impl_dx11.cpp | 24 +++++++++---------- examples/directx11_example/main.cpp | 4 ++-- examples/directx9_example/imgui_impl_dx9.cpp | 24 +++++++++---------- examples/directx9_example/main.cpp | 4 ++-- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/examples/directx10_example/imgui_impl_dx10.cpp b/examples/directx10_example/imgui_impl_dx10.cpp index e0afa6f65..13dc99c95 100644 --- a/examples/directx10_example/imgui_impl_dx10.cpp +++ b/examples/directx10_example/imgui_impl_dx10.cpp @@ -234,7 +234,7 @@ static bool IsAnyMouseButtonDown() return false; } -IMGUI_API LRESULT ImGui_ImplDX10_WndProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +IMGUI_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { ImGuiIO& io = ImGui::GetIO(); switch (msg) @@ -242,47 +242,47 @@ IMGUI_API LRESULT ImGui_ImplDX10_WndProcHandler(HWND hwnd, UINT msg, WPARAM wPar case WM_LBUTTONDOWN: if (!IsAnyMouseButtonDown()) ::SetCapture(hwnd); io.MouseDown[0] = true; - return true; + return 0; case WM_RBUTTONDOWN: if (!IsAnyMouseButtonDown()) ::SetCapture(hwnd); io.MouseDown[1] = true; - return true; + return 0; case WM_MBUTTONDOWN: if (!IsAnyMouseButtonDown()) ::SetCapture(hwnd); io.MouseDown[2] = true; - return true; + return 0; case WM_LBUTTONUP: io.MouseDown[0] = false; if (!IsAnyMouseButtonDown()) ::ReleaseCapture(); - return true; + return 0; case WM_RBUTTONUP: io.MouseDown[1] = false; if (!IsAnyMouseButtonDown()) ::ReleaseCapture(); - return true; + return 0; case WM_MBUTTONUP: io.MouseDown[2] = false; if (!IsAnyMouseButtonDown()) ::ReleaseCapture(); - return true; + return 0; case WM_MOUSEWHEEL: io.MouseWheel += GET_WHEEL_DELTA_WPARAM(wParam) > 0 ? +1.0f : -1.0f; - return true; + return 0; case WM_MOUSEMOVE: io.MousePos.x = (signed short)(lParam); io.MousePos.y = (signed short)(lParam >> 16); - return true; + return 0; case WM_KEYDOWN: if (wParam < 256) io.KeysDown[wParam] = 1; - return true; + return 0; case WM_KEYUP: if (wParam < 256) io.KeysDown[wParam] = 0; - return true; + return 0; case WM_CHAR: // You can also use ToAscii()+GetKeyboardState() to retrieve characters. if (wParam > 0 && wParam < 0x10000) io.AddInputCharacter((unsigned short)wParam); - return true; + return 0; } return 0; } diff --git a/examples/directx10_example/main.cpp b/examples/directx10_example/main.cpp index 4675a21da..ea690742d 100644 --- a/examples/directx10_example/main.cpp +++ b/examples/directx10_example/main.cpp @@ -74,10 +74,10 @@ void CleanupDeviceD3D() if (g_pd3dDevice) { g_pd3dDevice->Release(); g_pd3dDevice = NULL; } } -extern LRESULT ImGui_ImplDX10_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); +extern LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); LRESULT WINAPI WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - if (ImGui_ImplDX10_WndProcHandler(hWnd, msg, wParam, lParam)) + if (ImGui_ImplWin32_WndProcHandler(hWnd, msg, wParam, lParam)) return true; switch (msg) diff --git a/examples/directx11_example/imgui_impl_dx11.cpp b/examples/directx11_example/imgui_impl_dx11.cpp index 82c43f7e1..6d057e07c 100644 --- a/examples/directx11_example/imgui_impl_dx11.cpp +++ b/examples/directx11_example/imgui_impl_dx11.cpp @@ -241,7 +241,7 @@ static bool IsAnyMouseButtonDown() return false; } -IMGUI_API LRESULT ImGui_ImplDX11_WndProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +IMGUI_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { ImGuiIO& io = ImGui::GetIO(); switch (msg) @@ -249,47 +249,47 @@ IMGUI_API LRESULT ImGui_ImplDX11_WndProcHandler(HWND hwnd, UINT msg, WPARAM wPar case WM_LBUTTONDOWN: if (!IsAnyMouseButtonDown()) ::SetCapture(hwnd); io.MouseDown[0] = true; - return true; + return 0; case WM_RBUTTONDOWN: if (!IsAnyMouseButtonDown()) ::SetCapture(hwnd); io.MouseDown[1] = true; - return true; + return 0; case WM_MBUTTONDOWN: if (!IsAnyMouseButtonDown()) ::SetCapture(hwnd); io.MouseDown[2] = true; - return true; + return 0; case WM_LBUTTONUP: io.MouseDown[0] = false; if (!IsAnyMouseButtonDown()) ::ReleaseCapture(); - return true; + return 0; case WM_RBUTTONUP: io.MouseDown[1] = false; if (!IsAnyMouseButtonDown()) ::ReleaseCapture(); - return true; + return 0; case WM_MBUTTONUP: io.MouseDown[2] = false; if (!IsAnyMouseButtonDown()) ::ReleaseCapture(); - return true; + return 0; case WM_MOUSEWHEEL: io.MouseWheel += GET_WHEEL_DELTA_WPARAM(wParam) > 0 ? +1.0f : -1.0f; - return true; + return 0; case WM_MOUSEMOVE: io.MousePos.x = (signed short)(lParam); io.MousePos.y = (signed short)(lParam >> 16); - return true; + return 0; case WM_KEYDOWN: if (wParam < 256) io.KeysDown[wParam] = 1; - return true; + return 0; case WM_KEYUP: if (wParam < 256) io.KeysDown[wParam] = 0; - return true; + return 0; case WM_CHAR: // You can also use ToAscii()+GetKeyboardState() to retrieve characters. if (wParam > 0 && wParam < 0x10000) io.AddInputCharacter((unsigned short)wParam); - return true; + return 0; } return 0; } diff --git a/examples/directx11_example/main.cpp b/examples/directx11_example/main.cpp index 04321610e..794503e38 100644 --- a/examples/directx11_example/main.cpp +++ b/examples/directx11_example/main.cpp @@ -77,10 +77,10 @@ void CleanupDeviceD3D() if (g_pd3dDevice) { g_pd3dDevice->Release(); g_pd3dDevice = NULL; } } -extern LRESULT ImGui_ImplDX11_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); +extern LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); LRESULT WINAPI WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - if (ImGui_ImplDX11_WndProcHandler(hWnd, msg, wParam, lParam)) + if (ImGui_ImplWin32_WndProcHandler(hWnd, msg, wParam, lParam)) return true; switch (msg) diff --git a/examples/directx9_example/imgui_impl_dx9.cpp b/examples/directx9_example/imgui_impl_dx9.cpp index 0e94d3b81..111ed8153 100644 --- a/examples/directx9_example/imgui_impl_dx9.cpp +++ b/examples/directx9_example/imgui_impl_dx9.cpp @@ -181,7 +181,7 @@ static bool IsAnyMouseButtonDown() } // We use Win32 SetCapture/ReleaseCapture() API to enable reading the mouse outside our Windows bounds. -IMGUI_API LRESULT ImGui_ImplDX9_WndProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +IMGUI_API LRESULT ImGui_ImplWin32_WndProcHandler(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { ImGuiIO& io = ImGui::GetIO(); switch (msg) @@ -189,47 +189,47 @@ IMGUI_API LRESULT ImGui_ImplDX9_WndProcHandler(HWND hwnd, UINT msg, WPARAM wPara case WM_LBUTTONDOWN: if (!IsAnyMouseButtonDown()) ::SetCapture(hwnd); io.MouseDown[0] = true; - return true; + return 0; case WM_RBUTTONDOWN: if (!IsAnyMouseButtonDown()) ::SetCapture(hwnd); io.MouseDown[1] = true; - return true; + return 0; case WM_MBUTTONDOWN: if (!IsAnyMouseButtonDown()) ::SetCapture(hwnd); io.MouseDown[2] = true; - return true; + return 0; case WM_LBUTTONUP: io.MouseDown[0] = false; if (!IsAnyMouseButtonDown()) ::ReleaseCapture(); - return true; + return 0; case WM_RBUTTONUP: io.MouseDown[1] = false; if (!IsAnyMouseButtonDown()) ::ReleaseCapture(); - return true; + return 0; case WM_MBUTTONUP: io.MouseDown[2] = false; if (!IsAnyMouseButtonDown()) ::ReleaseCapture(); - return true; + return 0; case WM_MOUSEWHEEL: io.MouseWheel += GET_WHEEL_DELTA_WPARAM(wParam) > 0 ? +1.0f : -1.0f; - return true; + return 0; case WM_MOUSEMOVE: io.MousePos.x = (signed short)(lParam); io.MousePos.y = (signed short)(lParam >> 16); - return true; + return 0; case WM_KEYDOWN: if (wParam < 256) io.KeysDown[wParam] = 1; - return true; + return 0; case WM_KEYUP: if (wParam < 256) io.KeysDown[wParam] = 0; - return true; + return 0; case WM_CHAR: // You can also use ToAscii()+GetKeyboardState() to retrieve characters. if (wParam > 0 && wParam < 0x10000) io.AddInputCharacter((unsigned short)wParam); - return true; + return 0; } return 0; } diff --git a/examples/directx9_example/main.cpp b/examples/directx9_example/main.cpp index b8e5907c8..6a359c62b 100644 --- a/examples/directx9_example/main.cpp +++ b/examples/directx9_example/main.cpp @@ -12,10 +12,10 @@ static LPDIRECT3DDEVICE9 g_pd3dDevice = NULL; static D3DPRESENT_PARAMETERS g_d3dpp; -extern LRESULT ImGui_ImplDX9_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); +extern LRESULT ImGui_ImplWin32_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); LRESULT WINAPI WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { - if (ImGui_ImplDX9_WndProcHandler(hWnd, msg, wParam, lParam)) + if (ImGui_ImplWin32_WndProcHandler(hWnd, msg, wParam, lParam)) return true; switch (msg)