fixed typo in last commit

[wxWidgets.git] / src / msw / main.cpp

diff --git a/src/msw/main.cpp b/src/msw/main.cpp
index aaa5d051ae872417cd01c92aac33b50d2527f5a7..900ef4fdefad0b35f4c391b1f81e4638b770c3ad 100644 (file)
--- a/src/msw/main.cpp
+++ b/src/msw/main.cpp
@@ -69,7 +69,7 @@
 
 // wrap real wxEntry in a try-except block to be able to call
 // OnFatalException() if necessary
 
 // wrap real wxEntry in a try-except block to be able to call
 // OnFatalException() if necessary

-#if wxUSE_ON_FATAL_EXCEPTION
+#if wxUSE_ON_FATAL_EXCEPTION && wxUSE_BASE

 
 // global pointer to exception information, only valid inside OnFatalException,
 // used by wxStackWalker and wxCrashReport
 
 // global pointer to exception information, only valid inside OnFatalException,
 // used by wxStackWalker and wxCrashReport


@@ -128,6 +128,14 @@ bool wxHandleFatalExceptions(bool doit)
     // if the exception is not handled elsewhere, we have to also call it from
     // a special SEH translator function which is called by VC CRT when a Win32
     // exception occurs
     // if the exception is not handled elsewhere, we have to also call it from
     // a special SEH translator function which is called by VC CRT when a Win32
     // exception occurs

+
+    // this warns that /EHa (async exceptions) should be used when using
+    // _set_se_translator but, in fact, this doesn't seem to change anything
+    // with VC++ up to 7.1 -- to be confirmed with VC++ 8
+    #if _MSC_VER <= 1310
+        #pragma warning(disable:4535)
+    #endif
+

     _set_se_translator(doit ? wxSETranslator : NULL);
 #endif
 
     _set_se_translator(doit ? wxSETranslator : NULL);
 #endif
 


@@ -183,7 +191,7 @@ int wxEntry(int& argc, wxChar **argv)
     }
 }
 
     }
 }
 

-#endif // wxUSE_ON_FATAL_EXCEPTION
+#endif // wxUSE_ON_FATAL_EXCEPTION && wxUSE_BASE

 
 #if wxUSE_GUI
 
 
 #if wxUSE_GUI