forked from mia/Aegisub
Disable Ubuntu's global menu bar for Aegisub
wxWidgets currently doesn't generate menu open or update events for the Ubuntu menubar (since GTK doesn't send the relevant signals to the application), which we rely on. Updates #1531.
This commit is contained in:
parent
67c01d11f6
commit
78b70e987e
2 changed files with 6 additions and 1 deletions
|
@ -131,6 +131,11 @@ void AegisubApp::OnAssertFailure(const wxChar *file, int line, const wxChar *fun
|
|||
wxApp::OnAssertFailure(file, line, func, cond, msg);
|
||||
}
|
||||
|
||||
AegisubApp::AegisubApp() {
|
||||
// http://trac.wxwidgets.org/ticket/14302
|
||||
wxSetEnv("UBUNTU_MENUPROXY", "0");
|
||||
}
|
||||
|
||||
/// @brief Gets called when application starts.
|
||||
/// @return bool
|
||||
bool AegisubApp::OnInit() {
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
/// @ingroup main
|
||||
///
|
||||
|
||||
|
||||
#ifndef AGI_PRE
|
||||
#include <wx/app.h>
|
||||
#include <wx/file.h>
|
||||
|
@ -93,6 +92,7 @@ class AegisubApp: public wxApp {
|
|||
void HandleEvent(wxEvtHandler *handler, wxEventFunction func, wxEvent& event) const;
|
||||
|
||||
public:
|
||||
AegisubApp();
|
||||
AegisubLocale locale;
|
||||
FrameMain *frame;
|
||||
Automation4::AutoloadScriptManager *global_scripts;
|
||||
|
|
Loading…
Reference in a new issue