From 3c59ea9a0a5f1787a9a6245d2fd12f6c0f588cce Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Wed, 31 Dec 2014 15:21:32 -0800 Subject: [PATCH] Remove AegisubApp::HandleEvent OnExceptionInMainLoop covers the same functionality. --- src/main.cpp | 9 --------- src/main.h | 4 ---- vendor/wxWidgets | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index eac880e7e..327b13021 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -405,15 +405,6 @@ void AegisubApp::OnFatalException() { #define SHOW_EXCEPTION(str) \ wxMessageBox(fmt_tl("An unexpected error has occurred. Please save your work and restart Aegisub.\n\nError Message: %s", str), \ "Exception in event handler", wxOK | wxICON_ERROR | wxCENTER | wxSTAY_ON_TOP) -void AegisubApp::HandleEvent(wxEvtHandler *handler, wxEventFunction func, wxEvent& event) const { - try { - wxApp::HandleEvent(handler, func, event); - } - catch (...) { - const_cast(this)->OnExceptionInMainLoop(); - } -} - bool AegisubApp::OnExceptionInMainLoop() { try { throw; diff --git a/src/main.h b/src/main.h index 89c39696a..a52300204 100644 --- a/src/main.h +++ b/src/main.h @@ -56,10 +56,6 @@ class AegisubApp : public wxApp { /// @param msg Message void OnAssertFailure(const wxChar *file, int line, const wxChar *func, const wxChar *cond, const wxChar *msg) override; - // This function wraps all event handler calls anywhere in the application and is - // our ticket to catch exceptions happening in event handlers. - void HandleEvent(wxEvtHandler *handler, wxEventFunction func, wxEvent& event) const override; - FrameMain *frame = nullptr; public: AegisubApp(); diff --git a/vendor/wxWidgets b/vendor/wxWidgets index 54e23e459..fb5cec90b 160000 --- a/vendor/wxWidgets +++ b/vendor/wxWidgets @@ -1 +1 @@ -Subproject commit 54e23e4593decf90ec474e89e733f358973a212a +Subproject commit fb5cec90b55151299be7015c153f227d8c12c361