forked from mia/Aegisub
Disable the wxGTK accelerator workaround for wx 2.9.5
Unsurprisingly the munging around with the menu bar implementation details has resulted in things breaking, but fortunately the problem it was working around (#1314) appears to have been fixed entirely. Closes #1628.
This commit is contained in:
parent
2a35763a8a
commit
1d7334c129
|
@ -457,11 +457,11 @@ namespace menu {
|
||||||
window->Bind(wxEVT_COMMAND_MENU_SELECTED, &CommandManager::OnMenuClick, &menu->cm);
|
window->Bind(wxEVT_COMMAND_MENU_SELECTED, &CommandManager::OnMenuClick, &menu->cm);
|
||||||
window->SetMenuBar(menu.get());
|
window->SetMenuBar(menu.get());
|
||||||
|
|
||||||
#ifdef __WXGTK__
|
#if defined(__WXGTK__) && !wxCHECK_VERSION(2, 9, 5)
|
||||||
// GTK silently swallows keypresses for accelerators whose associated
|
// Older versions of wxGTK silently swallow keypresses for accelerators
|
||||||
// menu items are disabled. As we don't update the menu until it's
|
// whose associated menu items are disabled. As we don't update the
|
||||||
// opened, this means that conditional hotkeys don't work if the menu
|
// menu until it's opened, this means that conditional hotkeys don't
|
||||||
// hasn't been opened since they became valid.
|
// work if the menu hasn't been opened since they became valid.
|
||||||
//
|
//
|
||||||
// To work around this, we completely disable accelerators from menu
|
// To work around this, we completely disable accelerators from menu
|
||||||
// item. wxGTK doesn't expose any way to do this other that at wx
|
// item. wxGTK doesn't expose any way to do this other that at wx
|
||||||
|
|
Loading…
Reference in a new issue