From ce62990d91be5df571e0a66a341520ed778b49de Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Thu, 22 Dec 2011 21:16:53 +0000
Subject: [PATCH] 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.
---
 aegisub/src/main.h | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/aegisub/src/main.h b/aegisub/src/main.h
index d90d1d981..20f5c53e1 100644
--- a/aegisub/src/main.h
+++ b/aegisub/src/main.h
@@ -35,8 +35,6 @@
 ///
 
 
-///////////////////
-// Include headers
 #ifndef AGI_PRE
 #include <wx/app.h>
 #include <wx/file.h>
@@ -49,8 +47,11 @@
 #include <libaegisub/option_value.h>
 #include <libaegisub/path.h>
 
-//////////////
-// Prototypes
+#ifndef wxUSE_EXCEPTIONS
+#error wxWidgets is compiled without exceptions support. Aegisub requires exceptions support in wxWidgets to run safely.
+#endif
+
+
 class FrameMain;
 class PluginManager;
 #ifdef _DEBUG
@@ -136,15 +137,10 @@ public:
 	void OnFatalException();
 #endif
 
-#if defined(wxUSE_EXCEPTIONS)
+
 	// This function wraps all event handler calls anywhere in the application and is
-	// our ticket to catch exeptions happening in event handlers.
-    virtual void HandleEvent(wxEvtHandler *handler,
-                             wxEventFunction func,
-                             wxEvent& event) const;
-#else
-# error wxWidgets is compiled without exceptions support, Aegisub requires exceptions support in wxWidgets to run safely
-#endif
+	// our ticket to catch exceptions happening in event handlers.
+	void HandleEvent(wxEvtHandler *handler, wxEventFunction func, wxEvent& event) const;
 };
 
 DECLARE_APP(AegisubApp)