mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Disable the wxGTK accelerator workaround for wx 2.9.5

Browse source 
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:
Thomas Goyne 2013-09-01 13:34:53 -07:00
parent 2a35763a8a
commit 1d7334c129
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
aegisub/src/menu.cpp
View file

@ -457,11 +457,11 @@ namespace menu {
window->Bind(wxEVT_COMMAND_MENU_SELECTED, &CommandManager::OnMenuClick, &menu->cm);
window->SetMenuBar(menu.get());
#ifdef __WXGTK__
// GTK silently swallows keypresses for accelerators whose associated
// menu items are disabled. As we don't update the menu until it's
// opened, this means that conditional hotkeys don't work if the menu
// hasn't been opened since they became valid.
#if defined(__WXGTK__) && !wxCHECK_VERSION(2, 9, 5)
// Older versions of wxGTK silently swallow keypresses for accelerators
// whose associated menu items are disabled. As we don't update the
// menu until it's opened, this means that conditional hotkeys don't
// work if the menu hasn't been opened since they became valid.
//
// To work around this, we completely disable accelerators from menu
// item. wxGTK doesn't expose any way to do this other that at wx