Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup the GTK accelerator key creation

Browse Source 
* Remove the accelerator text if the key is not created
* Fix naming of some GTK keycodes
This commit is contained in:
Ian McInerney
2019-08-04 18:53:01 +02:00
parent 17e8e9c015
commit 891053792f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gtk/menu.cpp
View File

@@ -671,6 +671,11 @@ void wxMenuItem::SetGtkLabel()
m_menuItem, "activate", GetRootParentMenu(m_parentMenu)->m_accel, m_menuItem, "activate", GetRootParentMenu(m_parentMenu)->m_accel,
accel_key, accel_mods, GTK_ACCEL_VISIBLE); accel_key, accel_mods, GTK_ACCEL_VISIBLE);
} }
else
{
// Remove the accelerator since it couldn't be made
m_text = m_text.BeforeFirst( wxT( '\t' ) );
}
#endif // wxUSE_ACCEL #endif // wxUSE_ACCEL
} }
@@ -1066,7 +1071,7 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
// TODO: we should use gdk_keyval_name() (a.k.a. // TODO: we should use gdk_keyval_name() (a.k.a.
// XKeysymToString) here as well as hardcoding the keysym // XKeysymToString) here as well as hardcoding the keysym
// names this might be not portable // names this might be not portable
case WXK_INSERT: case WXK_INSERT:
hotkey << wxT("Insert" ); hotkey << wxT("Insert" );
break; break;
case WXK_DELETE: case WXK_DELETE:
@@ -1106,13 +1111,13 @@ static wxString GetGtkHotKey( const wxMenuItem& item )
hotkey << wxT("Tab" ); hotkey << wxT("Tab" );
break; break;
case WXK_ESCAPE: case WXK_ESCAPE:
hotkey << wxT("Esc" ); hotkey << wxT("Escape" );
break; break;
case WXK_SPACE: case WXK_SPACE:
hotkey << wxT("space" ); hotkey << wxT("space" );
break; break;
case WXK_MULTIPLY: case WXK_MULTIPLY:
hotkey << wxT("Multiply" ); hotkey << wxT("multiply" );
break; break;
case WXK_ADD: case WXK_ADD:
hotkey << wxT("Add" ); hotkey << wxT("Add" );