|
|
|
@ -493,7 +493,7 @@ static LRESULT CALLBACK ImGui_ImplGlfw_WndProc(HWND hWnd, UINT msg, WPARAM wPara |
|
|
|
|
ImGui::GetIO().AddMouseSourceEvent(GetMouseSourceFromMessageExtraInfo()); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
return ::CallWindowProc(bd->GlfwWndProc, hWnd, msg, wParam, lParam); |
|
|
|
|
return ::CallWindowProcW(bd->GlfwWndProc, hWnd, msg, wParam, lParam); |
|
|
|
|
} |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
@ -617,9 +617,9 @@ static bool ImGui_ImplGlfw_Init(GLFWwindow* window, bool install_callbacks, Glfw |
|
|
|
|
|
|
|
|
|
// Windows: register a WndProc hook so we can intercept some messages.
|
|
|
|
|
#ifdef _WIN32 |
|
|
|
|
bd->GlfwWndProc = (WNDPROC)::GetWindowLongPtr((HWND)main_viewport->PlatformHandleRaw, GWLP_WNDPROC); |
|
|
|
|
bd->GlfwWndProc = (WNDPROC)::GetWindowLongPtrW((HWND)main_viewport->PlatformHandleRaw, GWLP_WNDPROC); |
|
|
|
|
IM_ASSERT(bd->GlfwWndProc != nullptr); |
|
|
|
|
::SetWindowLongPtr((HWND)main_viewport->PlatformHandleRaw, GWLP_WNDPROC, (LONG_PTR)ImGui_ImplGlfw_WndProc); |
|
|
|
|
::SetWindowLongPtrW((HWND)main_viewport->PlatformHandleRaw, GWLP_WNDPROC, (LONG_PTR)ImGui_ImplGlfw_WndProc); |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|
bd->ClientApi = client_api; |
|
|
|
@ -659,7 +659,7 @@ void ImGui_ImplGlfw_Shutdown() |
|
|
|
|
// Windows: register a WndProc hook so we can intercept some messages.
|
|
|
|
|
#ifdef _WIN32 |
|
|
|
|
ImGuiViewport* main_viewport = ImGui::GetMainViewport(); |
|
|
|
|
::SetWindowLongPtr((HWND)main_viewport->PlatformHandleRaw, GWLP_WNDPROC, (LONG_PTR)bd->GlfwWndProc); |
|
|
|
|
::SetWindowLongPtrW((HWND)main_viewport->PlatformHandleRaw, GWLP_WNDPROC, (LONG_PTR)bd->GlfwWndProc); |
|
|
|
|
bd->GlfwWndProc = nullptr; |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
|