diff options
| author | root <root@rshg054.dnsready.net> | 2013-09-03 01:52:27 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-09-03 01:52:27 -0700 |
| commit | 3aa73e2018f321c9ccff8eca801b1c2fa9f18fa8 (patch) | |
| tree | 961d6e0475cac3875e6a31b558861367da0c93d8 /community/aegisub/wxgtk2.9.5.patch | |
| parent | 53939c2b159d972c48fc2f3652408632c71be77b (diff) | |
Tue Sep 3 01:50:53 PDT 2013
Diffstat (limited to 'community/aegisub/wxgtk2.9.5.patch')
| -rw-r--r-- | community/aegisub/wxgtk2.9.5.patch | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/community/aegisub/wxgtk2.9.5.patch b/community/aegisub/wxgtk2.9.5.patch index 5c0b805ff..b50fac01b 100644 --- a/community/aegisub/wxgtk2.9.5.patch +++ b/community/aegisub/wxgtk2.9.5.patch @@ -1,14 +1,3 @@ -From ca8036d425bf59020b476259e7857e8c67ebb6ba Mon Sep 17 00:00:00 2001 -From: Maxime Gauduin <alucryd@gmail.com> -Date: Mon, 12 Aug 2013 05:20:41 +0200 -Subject: [PATCH] wxStandardPaths is protected as of wxgtk 2.9.5 - ---- - aegisub/src/utils.cpp | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp -index 70c9ea1..f72593d 100644 --- a/aegisub/src/utils.cpp +++ b/aegisub/src/utils.cpp @@ -121,8 +121,7 @@ void RestartAegisub() { @@ -31,6 +20,22 @@ index 70c9ea1..f72593d 100644 #endif } --- -1.8.3.4 - +--- 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 |