X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e83f230124bbc1dfc93d5c9b3586fcc57f07ecf1..35f512937be0f668f60d3a064547bdfcfa83e4ba:/src/common/init.cpp?ds=sidebyside

diff --git a/src/common/init.cpp b/src/common/init.cpp
index bb56dd4007..e6d803cbe4 100644
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -338,16 +338,7 @@ static void DoCommonPostCleanup()
     FreeConvertedArgs();
 #endif // wxUSE_UNICODE
 
-    // check for memory leaks
-#if (defined(__WXDEBUG__) && wxUSE_MEMORY_TRACING) || wxUSE_DEBUG_CONTEXT
-    if (wxDebugContext::CountObjectsLeft(TRUE) > 0)
-    {
-        wxLogDebug(wxT("There were memory leaks.\n"));
-        wxDebugContext::Dump();
-        wxDebugContext::PrintStatistics();
-    }
-#endif // Debug
-
+    // Note: check for memory leaks is now done via wxDebugContextDumpDelayCounter
 #if wxUSE_LOG
     // and now delete the last logger as well
     delete wxLog::SetActiveTarget(NULL);
@@ -394,17 +385,9 @@ int wxEntryReal(int& argc, wxChar **argv)
 
     WX_SUPPRESS_UNUSED_WARN(cleanupOnExit);
 
-#if defined(__VISUALC__)
-	//Disable warning C4530: C++ exception handler used, but unwind semantics are not enabled. Specify -GX
-	#pragma warning (disable:4530)
-#endif  
-
     wxTRY
     {
 
-#if defined(__VISUALC__)
-	#pragma warning (default:4530)
-#endif  
         // app initialization
         if ( !wxTheApp->CallOnInit() )
         {