From c392bcca9053ad052baebc20a197ff389dc0cb43 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Sun, 3 Mar 2013 00:00:13 -0300 Subject: [PATCH] Fix win32 alt bug --- src/framework/core/application.cpp | 4 ---- src/framework/core/application.h | 2 +- src/framework/platform/win32window.cpp | 18 +++++------------- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/src/framework/core/application.cpp b/src/framework/core/application.cpp index 194a56fa..894dc6de 100644 --- a/src/framework/core/application.cpp +++ b/src/framework/core/application.cpp @@ -169,7 +169,3 @@ std::string Application::getOs() #endif } -std::string Application::getBuildDate() -{ - return std::string(__DATE__); -} diff --git a/src/framework/core/application.h b/src/framework/core/application.h index 5fd99282..2ae4311e 100644 --- a/src/framework/core/application.h +++ b/src/framework/core/application.h @@ -54,7 +54,7 @@ public: std::string getCharset() { return m_charset; } std::string getBuildCompiler() { return BUILD_COMPILER; } - std::string getBuildDate(); + std::string getBuildDate() { return std::string(__DATE__); } std::string getBuildRevision() { return BUILD_REVISION; } std::string getBuildCommit() { return BUILD_COMMIT; } std::string getBuildType() { return BUILD_TYPE; } diff --git a/src/framework/platform/win32window.cpp b/src/framework/platform/win32window.cpp index f712e058..edc7d803 100644 --- a/src/framework/platform/win32window.cpp +++ b/src/framework/platform/win32window.cpp @@ -619,20 +619,12 @@ LRESULT WIN32Window::windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar processKeyUp(retranslateVirtualKey(wParam, lParam)); break; } - case WM_SYSKEYUP: + case WM_SYSKEYUP: { + processKeyUp(retranslateVirtualKey(wParam, lParam)); + break; + } case WM_SYSKEYDOWN: { - // F10 is the shortcut key to enter a windows menu, this is a workaround to get F10 working - if(wParam != VK_F10) { - if(wParam != VK_MENU && wParam != VK_LMENU && wParam != VK_RMENU) - return DefWindowProc(hWnd, uMsg, wParam, lParam); - else - return 0; - } else { - if(uMsg == WM_SYSKEYUP) - processKeyUp(retranslateVirtualKey(wParam, lParam)); - else - processKeyDown(retranslateVirtualKey(wParam, lParam)); - } + processKeyDown(retranslateVirtualKey(wParam, lParam)); break; } case WM_LBUTTONDOWN: {