From c358e5ab6d1951f15b22fd3c98611c47feee7ab1 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 3 Aug 2013 00:20:48 +0200 Subject: [PATCH] Added option to disable menu keys under Windows Former-commit-id: a596eb7ab2a24a7246d0bf08eeb00a3d746639d8 --- include/Nazara/Utility/Config.hpp | 3 +++ src/Nazara/Utility/Win32/WindowImpl.cpp | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/include/Nazara/Utility/Config.hpp b/include/Nazara/Utility/Config.hpp index 27311b6fa..fa2806b47 100644 --- a/include/Nazara/Utility/Config.hpp +++ b/include/Nazara/Utility/Config.hpp @@ -50,4 +50,7 @@ // Protège les classes des accès concurrentiels //#define NAZARA_UTILITY_THREADSAFE 1 +// Sous Windows, fait en sorte que les touches ALT et F10 n'activent pas le menu de la fenêtre +#define NAZARA_UTILITY_WINDOWS_DISABLE_MENU_KEYS 1 + #endif // NAZARA_CONFIG_UTILITY_HPP diff --git a/src/Nazara/Utility/Win32/WindowImpl.cpp b/src/Nazara/Utility/Win32/WindowImpl.cpp index 3f4c2c152..c8c82a46f 100644 --- a/src/Nazara/Utility/Win32/WindowImpl.cpp +++ b/src/Nazara/Utility/Win32/WindowImpl.cpp @@ -960,6 +960,12 @@ bool NzWindowImpl::HandleMessage(HWND window, UINT message, WPARAM wParam, LPARA } } + #if NAZARA_UTILITY_WINDOWS_DISABLE_MENU_KEYS + // http://msdn.microsoft.com/en-us/library/windows/desktop/ms646360(v=vs.85).aspx + if (message == WM_SYSCOMMAND && wParam == SC_KEYMENU) + return true; + #endif + return false; }