removed wxYield from wxHtmlWindow (seems to work w/o it and yielding caused reentranc...

[wxWidgets.git] / src / common / init.cpp

diff --git a/src/common/init.cpp b/src/common/init.cpp
index 78576fb3c545eec7e749a34308f1eb430f41bf6f..41b3d29330f87cd820ffa60a49845aff2794fe44 100644 (file)
--- a/src/common/init.cpp
+++ b/src/common/init.cpp
@@ -35,7 +35,7 @@
 // global vars
 // ----------------------------------------------------------------------------
 
 // global vars
 // ----------------------------------------------------------------------------
 

-wxApp * WXDLLEXPORT wxTheApp = NULL;
+WXDLLEXPORT wxApp *wxTheApp = NULL;

 
 wxAppInitializerFunction
     wxAppBase::m_appInitFn = (wxAppInitializerFunction)NULL;
 
 wxAppInitializerFunction
     wxAppBase::m_appInitFn = (wxAppInitializerFunction)NULL;


@@ -76,13 +76,6 @@ void WXDLLEXPORT wxExit()
     abort();
 }
 
     abort();
 }
 

-// Yield to other apps/messages
-bool WXDLLEXPORT wxYield()
-{
-    // do nothing
-    return TRUE;
-}
-

 // Yield to other apps/messages
 void WXDLLEXPORT wxWakeUpIdle()
 {
 // Yield to other apps/messages
 void WXDLLEXPORT wxWakeUpIdle()
 {


@@ -219,9 +212,8 @@ static void DoCleanUp()
     // continuing to use user defined log target is unsafe from now on because
     // some resources may be already unavailable, so replace it by something
     // more safe
     // continuing to use user defined log target is unsafe from now on because
     // some resources may be already unavailable, so replace it by something
     // more safe

-    wxLog *oldlog = wxLog::SetActiveTarget(new wxLogStderr);
-    if ( oldlog )
-        delete oldlog;
+    wxLog::DontCreateOnDemand();
+    delete wxLog::SetActiveTarget(new wxLogStderr);

 #endif // wxUSE_LOG
 
     wxModule::CleanUpModules();
 #endif // wxUSE_LOG
 
     wxModule::CleanUpModules();


@@ -231,4 +223,9 @@ static void DoCleanUp()
     // delete the application object
     delete wxTheApp;
     wxTheApp = (wxApp *)NULL;
     // delete the application object
     delete wxTheApp;
     wxTheApp = (wxApp *)NULL;

+
+#if wxUSE_LOG
+    // and now delete the last logger as well
+    delete wxLog::SetActiveTarget(NULL);
+#endif // wxUSE_LOG

 }
 }