From 7bcf380ee2db1806620d67e69ab1ea8d505e1a89 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Tue, 21 Dec 2004 16:10:00 +0000 Subject: [PATCH] * modules/gui/wxwindows/interface.cpp: fixed hotkeys with modifiers on win32. --- modules/gui/wxwindows/interface.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/gui/wxwindows/interface.cpp b/modules/gui/wxwindows/interface.cpp index eef3c60a62..915dd47a60 100644 --- a/modules/gui/wxwindows/interface.cpp +++ b/modules/gui/wxwindows/interface.cpp @@ -578,8 +578,14 @@ void Interface::SetupHotkeys() /* Setup the hotkeys as accelerators */ for( int i = 0; i < i_hotkeys; i++ ) { - p_entries[i].Set( ConvertHotkeyModifiers( p_hotkeys[i].i_key ), - ConvertHotkey( p_hotkeys[i].i_key ), + int i_mod = ConvertHotkeyModifiers( p_hotkeys[i].i_key ); + int i_key = ConvertHotkey( p_hotkeys[i].i_key ); + +#ifdef WIN32 + if( i_mod ) i_key = toupper(i_key); +#endif + + p_entries[i].Set( i_mod, i_key, p_intf->p_sys->i_first_hotkey_event + i ); } -- GitLab