diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-12 03:39:46 +0000 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-01-12 03:39:46 +0000 |
commit | 61e090957dbc6b062f3a1af7eeb0d58478c6657d (patch) | |
tree | 768f076ead75d57e34580da0d78ff9f5afe170fd /community/aegisub/wxgtk2.9.5.patch | |
parent | b8322aaddc0dc6b249457dd19ab7fb246b92c997 (diff) |
Sun Jan 12 03:35:50 UTC 2014
Diffstat (limited to 'community/aegisub/wxgtk2.9.5.patch')
-rw-r--r-- | community/aegisub/wxgtk2.9.5.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/community/aegisub/wxgtk2.9.5.patch b/community/aegisub/wxgtk2.9.5.patch deleted file mode 100644 index b50fac01b..000000000 --- a/community/aegisub/wxgtk2.9.5.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/aegisub/src/utils.cpp -+++ b/aegisub/src/utils.cpp -@@ -121,8 +121,7 @@ void RestartAegisub() { - config::opt->Flush(); - - #if defined(__WXMSW__) -- wxStandardPaths stand; -- wxExecute("\"" + stand.GetExecutablePath() + "\""); -+ wxExecute("\"" + wxStandardPaths::Get().GetExecutablePath() + "\""); - #elif defined(__WXMAC__) - std::string bundle_path = agi::util::OSX_GetBundlePath(); - std::string helper_path = agi::util::OSX_GetBundleAuxillaryExecutablePath("restart-helper"); -@@ -132,8 +131,7 @@ void RestartAegisub() { - LOG_I("util/restart/exec") << exec; - wxExecute(exec); - #else -- wxStandardPaths stand; -- wxExecute(stand.GetExecutablePath()); -+ wxExecute(wxStandardPaths::Get().GetExecutablePath()); - #endif - } - ---- 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 |