Fixed displayed modifiers for hotkeys in context menus (GAL).
This commit is contained in:
parent
df15be4f01
commit
4661e39e08
|
@ -205,17 +205,17 @@ void CONTEXT_MENU::updateHotKeys()
|
||||||
{
|
{
|
||||||
int key = action.GetHotKey() & ~MD_MODIFIER_MASK;
|
int key = action.GetHotKey() & ~MD_MODIFIER_MASK;
|
||||||
int mod = action.GetHotKey() & MD_MODIFIER_MASK;
|
int mod = action.GetHotKey() & MD_MODIFIER_MASK;
|
||||||
int flags = wxACCEL_NORMAL;
|
int flags = 0;
|
||||||
wxMenuItem* item = FindChildItem( id );
|
wxMenuItem* item = FindChildItem( id );
|
||||||
|
|
||||||
if( item )
|
if( item )
|
||||||
{
|
{
|
||||||
switch( mod )
|
flags |= ( mod & MD_ALT ) ? wxACCEL_ALT : 0;
|
||||||
{
|
flags |= ( mod & MD_CTRL ) ? wxACCEL_CTRL : 0;
|
||||||
case MD_ALT: flags = wxACCEL_ALT; break;
|
flags |= ( mod & MD_SHIFT ) ? wxACCEL_SHIFT : 0;
|
||||||
case MD_CTRL: flags = wxACCEL_CTRL; break;
|
|
||||||
case MD_SHIFT: flags = wxACCEL_SHIFT; break;
|
if( !flags )
|
||||||
}
|
flags = wxACCEL_NORMAL;
|
||||||
|
|
||||||
wxAcceleratorEntry accel( flags, key, id, item );
|
wxAcceleratorEntry accel( flags, key, id, item );
|
||||||
item->SetAccel( &accel );
|
item->SetAccel( &accel );
|
||||||
|
|
Loading…
Reference in New Issue