Fix win32 alt bug
This commit is contained in:
parent
62921dee9b
commit
c392bcca90
|
@ -169,7 +169,3 @@ std::string Application::getOs()
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string Application::getBuildDate()
|
|
||||||
{
|
|
||||||
return std::string(__DATE__);
|
|
||||||
}
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ public:
|
||||||
|
|
||||||
std::string getCharset() { return m_charset; }
|
std::string getCharset() { return m_charset; }
|
||||||
std::string getBuildCompiler() { return BUILD_COMPILER; }
|
std::string getBuildCompiler() { return BUILD_COMPILER; }
|
||||||
std::string getBuildDate();
|
std::string getBuildDate() { return std::string(__DATE__); }
|
||||||
std::string getBuildRevision() { return BUILD_REVISION; }
|
std::string getBuildRevision() { return BUILD_REVISION; }
|
||||||
std::string getBuildCommit() { return BUILD_COMMIT; }
|
std::string getBuildCommit() { return BUILD_COMMIT; }
|
||||||
std::string getBuildType() { return BUILD_TYPE; }
|
std::string getBuildType() { return BUILD_TYPE; }
|
||||||
|
|
|
@ -619,20 +619,12 @@ LRESULT WIN32Window::windowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
|
||||||
processKeyUp(retranslateVirtualKey(wParam, lParam));
|
processKeyUp(retranslateVirtualKey(wParam, lParam));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case WM_SYSKEYUP:
|
case WM_SYSKEYUP: {
|
||||||
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));
|
processKeyUp(retranslateVirtualKey(wParam, lParam));
|
||||||
else
|
break;
|
||||||
processKeyDown(retranslateVirtualKey(wParam, lParam));
|
|
||||||
}
|
}
|
||||||
|
case WM_SYSKEYDOWN: {
|
||||||
|
processKeyDown(retranslateVirtualKey(wParam, lParam));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case WM_LBUTTONDOWN: {
|
case WM_LBUTTONDOWN: {
|
||||||
|
|
Loading…
Reference in New Issue