From 1d7334c1290e9bab5a33890468c2b7216413115b Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Sun, 1 Sep 2013 13:34:53 -0700 Subject: [PATCH] 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. --- aegisub/src/menu.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/aegisub/src/menu.cpp b/aegisub/src/menu.cpp index ede34db56..a1fac9783 100644 --- a/aegisub/src/menu.cpp +++ b/aegisub/src/menu.cpp @@ -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