mirror of https://github.com/odrling/Aegisub
Don't wrap the declaration of AegisubApp::HandleEvent in a ifdef check for wxUSE_EXCEPTIONS as we require that wx be built with exception support
Originally committed to SVN as r6047.
This commit is contained in:
parent
a66cc26706
commit
ce62990d91
|
@ -35,8 +35,6 @@
|
||||||
///
|
///
|
||||||
|
|
||||||
|
|
||||||
///////////////////
|
|
||||||
// Include headers
|
|
||||||
#ifndef AGI_PRE
|
#ifndef AGI_PRE
|
||||||
#include <wx/app.h>
|
#include <wx/app.h>
|
||||||
#include <wx/file.h>
|
#include <wx/file.h>
|
||||||
|
@ -49,8 +47,11 @@
|
||||||
#include <libaegisub/option_value.h>
|
#include <libaegisub/option_value.h>
|
||||||
#include <libaegisub/path.h>
|
#include <libaegisub/path.h>
|
||||||
|
|
||||||
//////////////
|
#ifndef wxUSE_EXCEPTIONS
|
||||||
// Prototypes
|
#error wxWidgets is compiled without exceptions support. Aegisub requires exceptions support in wxWidgets to run safely.
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
class FrameMain;
|
class FrameMain;
|
||||||
class PluginManager;
|
class PluginManager;
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
|
@ -136,15 +137,10 @@ public:
|
||||||
void OnFatalException();
|
void OnFatalException();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(wxUSE_EXCEPTIONS)
|
|
||||||
// This function wraps all event handler calls anywhere in the application and is
|
// This function wraps all event handler calls anywhere in the application and is
|
||||||
// our ticket to catch exeptions happening in event handlers.
|
// our ticket to catch exceptions happening in event handlers.
|
||||||
virtual void HandleEvent(wxEvtHandler *handler,
|
void HandleEvent(wxEvtHandler *handler, wxEventFunction func, wxEvent& event) const;
|
||||||
wxEventFunction func,
|
|
||||||
wxEvent& event) const;
|
|
||||||
#else
|
|
||||||
# error wxWidgets is compiled without exceptions support, Aegisub requires exceptions support in wxWidgets to run safely
|
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
DECLARE_APP(AegisubApp)
|
DECLARE_APP(AegisubApp)
|
||||||
|
|
Loading…
Reference in New Issue