X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/04662def27c4227f8372084167e3a37729c048b9..2245b2b2c3339ecf023e5880caa803610a5d1907:/src/common/log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 182246bdb0..93842ef100 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -168,7 +168,7 @@ void wxVLogFatalError(const wxChar *szFormat, va_list argptr)
 #if wxUSE_GUI
     wxMessageBox(s_szBuf, _("Fatal Error"), wxID_OK | wxICON_STOP);
 #else
-    fprintf(stderr, _("Fatal error: %s\n"), s_szBuf);
+    wxFprintf(stderr, _("Fatal error: %s\n"), s_szBuf);
 #endif
 
     abort();
@@ -246,7 +246,7 @@ void wxLogVerbose(const wxChar *szFormat, ...)
       p += 2;
 
       wxVsnprintf(p, len, szFormat, argptr);
-      
+
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
     }
   }
@@ -349,7 +349,7 @@ wxLog::wxLog()
     m_bHasMessages = FALSE;
 }
 
-wxChar *wxLog::SetLogBuffer( wxChar *buf, size_t size = 0 )
+wxChar *wxLog::SetLogBuffer( wxChar *buf, size_t size)
 {
     wxChar *oldbuf = s_szBuf;
 
@@ -561,7 +561,7 @@ Boolean IsCompatibleVersion(short inVersion)
         result = (inVersion <= block->apiHiVersion);
     }
 
-    return result;    
+    return result;
 }
 
 /* ---------------------------------------------------------------------------
@@ -764,16 +764,24 @@ void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 
 wxLogChain::wxLogChain(wxLog *logger)
 {
+    m_bPassMessages = TRUE;
+
     m_logNew = logger;
     m_logOld = wxLog::SetActiveTarget(this);
 }
 
-void wxLogChain::SetLog(wxLog *logger)
+wxLogChain::~wxLogChain()
 {
+    delete m_logOld;
+
     if ( m_logNew != this )
         delete m_logNew;
+}
 
-    wxLog::SetActiveTarget(logger);
+void wxLogChain::SetLog(wxLog *logger)
+{
+    if ( m_logNew != this )
+        delete m_logNew;
 
     m_logNew = logger;
 }