iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove AegisubApp::HandleEvent 

OnExceptionInMainLoop covers the same functionality.
This commit is contained in:
Thomas Goyne 2014-12-31 15:21:32 -08:00
parent 2a33b35f60
commit 3c59ea9a0a
3 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.cpp
View File

@ -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<AegisubApp *>(this)->OnExceptionInMainLoop();
}
}
bool AegisubApp::OnExceptionInMainLoop() {
try {
throw;

4
src/main.h
View File

@ -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();

2
vendor/wxWidgets vendored

@ -1 +1 @@
Subproject commit 54e23e4593decf90ec474e89e733f358973a212a
Subproject commit fb5cec90b55151299be7015c153f227d8c12c361