/[pcsx2_0.9.7]/trunk/3rdparty/wxWidgets/src/msw/main.cpp
ViewVC logotype

Diff of /trunk/3rdparty/wxWidgets/src/msw/main.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/3rdparty/wxWidgets/src/msw/main.cpp	2010/09/07 06:28:05	61
+++ trunk/3rdparty/wxWidgets/src/msw/main.cpp	2010/09/07 11:08:22	62
@@ -100,7 +100,7 @@
 
 // global pointer to exception information, only valid inside OnFatalException,
 // used by wxStackWalker and wxCrashReport
-extern EXCEPTION_POINTERS *wxGlobalSEInformation = NULL;
+EXCEPTION_POINTERS *wxGlobalSEInformation = NULL;
 
 // flag telling us whether the application wants to handle exceptions at all
 static bool gs_handleExceptions = false;
@@ -211,19 +211,20 @@
     wxSEH_HANDLE(-1)
 }
 
-#else // !wxUSE_ON_FATAL_EXCEPTION
-
+// PCSX2: Moved this to inside the wxUSE_ON_FATAL_EXCEPTION condition --air
 #if defined(__VISUALC__) && !defined(__WXWINCE__)
 
 static void
 wxSETranslator(unsigned int WXUNUSED(code), EXCEPTION_POINTERS * WXUNUSED(ep))
 {
-    // see wxSETranslator() version for wxUSE_ON_FATAL_EXCEPTION above
-    throw;
+	// see wxSETranslator() version for wxUSE_ON_FATAL_EXCEPTION above
+	throw;
 }
 
 #endif // __VISUALC__
 
+#else // !wxUSE_ON_FATAL_EXCEPTION
+
 int wxEntry(int& argc, wxChar **argv)
 {
     DisableAutomaticSETranslator();

 

  ViewVC Help
Powered by ViewVC 1.1.22