blob: b50fac01be03a6e80f30b03aa8f4935ee5909d4a (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
--- 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
|
