X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93da8c424662337cb2f6bb21cf1d23ad1bcda0a0..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/log.cpp?ds=sidebyside

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 0b9f5eb8c3..9cdf13a271 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -1,12 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        log.cpp
+// Name:        src/common/log.cpp
 // Purpose:     Assorted wxLogXXX functions, and wxLog (sink for logs)
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -16,42 +16,76 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
-#ifdef __GNUG__
-  #pragma implementation "log.h"
-#endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-  #pragma hdrstop
+    #pragma hdrstop
 #endif
 
-// wxWindows
-#ifndef WX_PRECOMP
-  #include  <wx/app.h>
-  #include  <wx/string.h>
-  #include  <wx/intl.h>
+#if wxUSE_LOG
 
-  #include  <wx/generic/msgdlgg.h>
-  #include  <wx/filedlg.h>
-  #include  <wx/textctrl.h>
+// wxWidgets
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/arrstr.h"
+    #include "wx/intl.h"
+    #include "wx/string.h"
+    #include "wx/utils.h"
 #endif //WX_PRECOMP
 
-#include  <wx/file.h>
-#include  <wx/textfile.h>
-#include  <wx/log.h>
+#include "wx/apptrait.h"
+#include "wx/datetime.h"
+#include "wx/file.h"
+#include "wx/msgout.h"
+#include "wx/textfile.h"
+#include "wx/thread.h"
+#include "wx/crt.h"
 
 // other standard headers
-#include  <errno.h>
-#include  <stdlib.h>
-#include  <time.h>
+#ifndef __WXWINCE__
+#include <errno.h>
+#endif
 
-#ifdef  __WINDOWS__
-  #include  <windows.h>
-#else   //Unix
-  #include  <signal.h>
-#endif  //Win/Unix
+#include <stdlib.h>
+
+#ifndef __WXPALMOS5__
+#ifndef __WXWINCE__
+#include <time.h>
+#else
+#include "wx/msw/wince/time.h"
+#endif
+#endif /* ! __WXPALMOS5__ */
+
+#if defined(__WINDOWS__)
+    #include "wx/msw/private.h" // includes windows.h
+#endif
+
+#if wxUSE_THREADS
+
+// define static functions providing access to the critical sections we use
+// instead of just using static critical section variables as log functions may
+// be used during static initialization and while this is certainly not
+// advisable it's still better to not crash (as we'd do if we used a yet
+// uninitialized critical section) if it happens
+
+static inline wxCriticalSection& GetTraceMaskCS()
+{
+    static wxCriticalSection s_csTrace;
+
+    return s_csTrace;
+}
+
+static inline wxCriticalSection& GetPreviousLogCS()
+{
+    static wxCriticalSection s_csPrev;
+
+    return s_csPrev;
+}
+
+#endif // wxUSE_THREADS
 
 // ----------------------------------------------------------------------------
 // non member functions
@@ -75,92 +109,292 @@
 //     macros and not all compilers inline vararg functions.
 // ----------------------------------------------------------------------------
 
-// log functions can't allocate memory (LogError("out of memory...") should
-// work!), so we use a static buffer for all log messages
-#define LOG_BUFFER_SIZE   (4096)
-
-// static buffer for error messages (@@@ MT-unsafe)
-static char s_szBuf[LOG_BUFFER_SIZE];
-
 // generic log function
-void wxLogGeneric(wxLogLevel level, wxTString strFormat, ...)
+void wxVLogGeneric(wxLogLevel level, const wxString& format, va_list argptr)
+{
+    if ( wxLog::IsEnabled() ) {
+        wxLog::OnLog(level, wxString::FormatV(format, argptr), time(NULL));
+    }
+}
+
+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxDoLogGenericWchar(wxLogLevel level, const wxChar *format, ...)
 {
-  if ( wxLog::GetActiveTarget() != NULL ) {
     va_list argptr;
-    va_start(argptr, strFormat);
-    vsprintf(s_szBuf, strFormat, argptr);
+    va_start(argptr, format);
+    wxVLogGeneric(level, format, argptr);
     va_end(argptr);
+}
+#endif // wxUSE_UTF8_LOCALE_ONLY
 
-    wxLog::OnLog(level, s_szBuf);
-  }
+#if wxUSE_UNICODE_UTF8
+void wxDoLogGenericUtf8(wxLogLevel level, const char *format, ...)
+{
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogGeneric(level, format, argptr);
+    va_end(argptr);
 }
+#endif // wxUSE_UNICODE_UTF8
+
+#if !wxUSE_UTF8_LOCALE_ONLY
+    #define IMPLEMENT_LOG_FUNCTION_WCHAR(level)                         \
+      void wxDoLog##level##Wchar(const wxChar *format, ...)             \
+      {                                                                 \
+        va_list argptr;                                                 \
+        va_start(argptr, format);                                       \
+        wxVLog##level(format, argptr);                                  \
+        va_end(argptr);                                                 \
+      }
+#else
+    #define IMPLEMENT_LOG_FUNCTION_WCHAR(level)
+#endif
 
-#define IMPLEMENT_LOG_FUNCTION(level)                             \
-  void wxLog##level(wxTString strFormat, ...)                     \
-  {                                                               \
-    if ( wxLog::GetActiveTarget() != NULL ) {                     \
-      va_list argptr;                                             \
-      va_start(argptr, strFormat);                                \
-      vsprintf(s_szBuf, strFormat, argptr);                       \
-      va_end(argptr);                                             \
-                                                                  \
-      wxLog::OnLog(wxLOG_##level, s_szBuf);                       \
-    }                                                             \
-  }
+#if wxUSE_UNICODE_UTF8
+    #define IMPLEMENT_LOG_FUNCTION_UTF8(level)                          \
+      void wxDoLog##level##Utf8(const char *format, ...)                \
+      {                                                                 \
+        va_list argptr;                                                 \
+        va_start(argptr, format);                                       \
+        wxVLog##level(format, argptr);                                  \
+        va_end(argptr);                                                 \
+      }
+#else
+    #define IMPLEMENT_LOG_FUNCTION_UTF8(level)
+#endif
+
+#define IMPLEMENT_LOG_FUNCTION(level)                               \
+  void wxVLog##level(const wxString& format, va_list argptr)        \
+  {                                                                 \
+    if ( wxLog::IsEnabled() ) {                                     \
+      wxLog::OnLog(wxLOG_##level,                                   \
+                   wxString::FormatV(format, argptr), time(NULL));  \
+    }                                                               \
+  }                                                                 \
+  IMPLEMENT_LOG_FUNCTION_WCHAR(level)                               \
+  IMPLEMENT_LOG_FUNCTION_UTF8(level)
 
-IMPLEMENT_LOG_FUNCTION(FatalError)
 IMPLEMENT_LOG_FUNCTION(Error)
 IMPLEMENT_LOG_FUNCTION(Warning)
 IMPLEMENT_LOG_FUNCTION(Message)
 IMPLEMENT_LOG_FUNCTION(Info)
 IMPLEMENT_LOG_FUNCTION(Status)
 
+void wxSafeShowMessage(const wxString& title, const wxString& text)
+{
+#ifdef __WINDOWS__
+    ::MessageBox(NULL, text.wx_str(), title.wx_str(), MB_OK | MB_ICONSTOP);
+#else
+    wxFprintf(stderr, wxS("%s: %s\n"), title.c_str(), text.c_str());
+    fflush(stderr);
+#endif
+}
+
+// fatal errors can't be suppressed nor handled by the custom log target and
+// always terminate the program
+void wxVLogFatalError(const wxString& format, va_list argptr)
+{
+    wxSafeShowMessage(wxS("Fatal Error"), wxString::FormatV(format, argptr));
+
+#ifdef __WXWINCE__
+    ExitThread(3);
+#else
+    abort();
+#endif
+}
+
+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxDoLogFatalErrorWchar(const wxChar *format, ...)
+{
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogFatalError(format, argptr);
+
+    // some compilers warn about unreachable code and it shouldn't matter
+    // for the others anyhow...
+    //va_end(argptr);
+}
+#endif // wxUSE_UTF8_LOCALE_ONLY
+
+#if wxUSE_UNICODE_UTF8
+void wxDoLogFatalErrorUtf8(const char *format, ...)
+{
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogFatalError(format, argptr);
+
+    // some compilers warn about unreachable code and it shouldn't matter
+    // for the others anyhow...
+    //va_end(argptr);
+}
+#endif // wxUSE_UNICODE_UTF8
+
 // same as info, but only if 'verbose' mode is on
-void wxLogVerbose(wxTString strFormat, ...)
+void wxVLogVerbose(const wxString& format, va_list argptr)
+{
+    if ( wxLog::IsEnabled() ) {
+        if ( wxLog::GetActiveTarget() != NULL && wxLog::GetVerbose() ) {
+            wxLog::OnLog(wxLOG_Info,
+                         wxString::FormatV(format, argptr), time(NULL));
+        }
+    }
+}
+
+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxDoLogVerboseWchar(const wxChar *format, ...)
 {
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->GetVerbose() ) {
     va_list argptr;
-    va_start(argptr, strFormat);
-    vsprintf(s_szBuf, strFormat, argptr);
+    va_start(argptr, format);
+    wxVLogVerbose(format, argptr);
     va_end(argptr);
+}
+#endif // !wxUSE_UTF8_LOCALE_ONLY
 
-    wxLog::OnLog(wxLOG_Info, s_szBuf);
-  }
+#if wxUSE_UNICODE_UTF8
+void wxDoLogVerboseUtf8(const char *format, ...)
+{
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogVerbose(format, argptr);
+    va_end(argptr);
 }
+#endif // wxUSE_UNICODE_UTF8
 
 // debug functions
-#ifdef __DEBUG__
-#define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                       \
-  void wxLog##level(const char *szFormat, ...)                    \
-  {                                                               \
-    if ( wxLog::GetActiveTarget() != NULL ) {                     \
-      va_list argptr;                                             \
-      va_start(argptr, szFormat);                                 \
-      vsprintf(s_szBuf, szFormat, argptr);                        \
-      va_end(argptr);                                             \
-                                                                  \
-      wxLog::OnLog(wxLOG_##level, s_szBuf);                       \
-    }                                                             \
+#ifdef __WXDEBUG__
+
+#if !wxUSE_UTF8_LOCALE_ONLY
+    #define IMPLEMENT_LOG_DEBUG_FUNCTION_WCHAR(level)                   \
+      void wxDoLog##level##Wchar(const wxChar *format, ...)             \
+      {                                                                 \
+        va_list argptr;                                                 \
+        va_start(argptr, format);                                       \
+        wxVLog##level(format, argptr);                                  \
+        va_end(argptr);                                                 \
+      }
+#else
+    #define IMPLEMENT_LOG_DEBUG_FUNCTION_WCHAR(level)
+#endif
+
+#if wxUSE_UNICODE_UTF8
+    #define IMPLEMENT_LOG_DEBUG_FUNCTION_UTF8(level)                    \
+      void wxDoLog##level##Utf8(const char *format, ...)                \
+      {                                                                 \
+        va_list argptr;                                                 \
+        va_start(argptr, format);                                       \
+        wxVLog##level(format, argptr);                                  \
+        va_end(argptr);                                                 \
+      }
+#else
+    #define IMPLEMENT_LOG_DEBUG_FUNCTION_UTF8(level)
+#endif
+
+#define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                         \
+  void wxVLog##level(const wxString& format, va_list argptr)        \
+  {                                                                 \
+    if ( wxLog::IsEnabled() ) {                                     \
+      wxLog::OnLog(wxLOG_##level,                                   \
+                   wxString::FormatV(format, argptr), time(NULL));  \
+    }                                                               \
+  }                                                                 \
+  IMPLEMENT_LOG_DEBUG_FUNCTION_WCHAR(level)                         \
+  IMPLEMENT_LOG_DEBUG_FUNCTION_UTF8(level)
+
+
+  void wxVLogTrace(const wxString& mask, const wxString& format, va_list argptr)
+  {
+    if ( wxLog::IsEnabled() && wxLog::IsAllowedTraceMask(mask) ) {
+      wxString msg;
+      msg << wxS("(") << mask << wxS(") ") << wxString::FormatV(format, argptr);
+
+      wxLog::OnLog(wxLOG_Trace, msg, time(NULL));
+    }
   }
 
-  void wxLogTrace(wxTraceMask mask, const char *szFormat, ...)
+#if !wxUSE_UTF8_LOCALE_ONLY
+  void wxDoLogTraceWchar(const wxString& mask, const wxChar *format, ...)
   {
-    wxLog *pLog = wxLog::GetActiveTarget();
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogTrace(mask, format, argptr);
+    va_end(argptr);
+  }
+#endif // !wxUSE_UTF8_LOCALE_ONLY
 
+#if wxUSE_UNICODE_UTF8
+  void wxDoLogTraceUtf8(const wxString& mask, const char *format, ...)
+  {
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogTrace(mask, format, argptr);
+    va_end(argptr);
+  }
+#endif // wxUSE_UNICODE_UTF8
+
+  void wxVLogTrace(wxTraceMask mask, const wxString& format, va_list argptr)
+  {
     // we check that all of mask bits are set in the current mask, so
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
     // if both bits are set.
-    if ( pLog != NULL && (pLog->GetTraceMask() & mask == mask) ) {
-      va_list argptr;
-      va_start(argptr, szFormat);
-      vsprintf(s_szBuf, szFormat, argptr);
-      va_end(argptr);
-
-      wxLog::OnLog(wxLOG_Trace, s_szBuf);
+    if ( wxLog::IsEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
+      wxLog::OnLog(wxLOG_Trace, wxString::FormatV(format, argptr), time(NULL));
     }
   }
 
+#if !wxUSE_UTF8_LOCALE_ONLY
+  void wxDoLogTraceWchar(wxTraceMask mask, const wxChar *format, ...)
+  {
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogTrace(mask, format, argptr);
+    va_end(argptr);
+  }
+#endif // !wxUSE_UTF8_LOCALE_ONLY
+
+#if wxUSE_UNICODE_UTF8
+  void wxDoLogTraceUtf8(wxTraceMask mask, const char *format, ...)
+  {
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogTrace(mask, format, argptr);
+    va_end(argptr);
+  }
+#endif // wxUSE_UNICODE_UTF8
+
+#ifdef __WATCOMC__
+  // workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
+  void wxDoLogTraceWchar(int mask, const wxChar *format, ...)
+  {
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogTrace(mask, format, argptr);
+    va_end(argptr);
+  }
+
+  void wxDoLogTraceWchar(const char *mask, const wxChar *format, ...)
+  {
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogTrace(mask, format, argptr);
+    va_end(argptr);
+  }
+
+  void wxDoLogTraceWchar(const wchar_t *mask, const wxChar *format, ...)
+  {
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogTrace(mask, format, argptr);
+    va_end(argptr);
+  }
+
+  void wxVLogTrace(int mask, const wxString& format, va_list argptr)
+    { wxVLogTrace((wxTraceMask)mask, format, argptr); }
+  void wxVLogTrace(const char *mask, const wxString& format, va_list argptr)
+    { wxVLogTrace(wxString(mask), format, argptr); }
+  void wxVLogTrace(const wchar_t *mask, const wxString& format, va_list argptr)
+    { wxVLogTrace(wxString(mask), format, argptr); }
+#endif // __WATCOMC__
+
 #else // release
   #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)
 #endif
@@ -171,531 +405,555 @@ IMPLEMENT_LOG_DEBUG_FUNCTION(Trace)
 // wxLogSysError: one uses the last error code, for other  you must give it
 // explicitly
 
-// common part of both wxLogSysError
-void wxLogSysErrorHelper(long lErrCode)
+// return the system error message description
+static inline wxString wxLogSysErrorHelper(long err)
 {
-  char szErrMsg[LOG_BUFFER_SIZE / 2];
-  sprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
-  strncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - strlen(s_szBuf));
+    return wxString::Format(_(" (error %ld: %s)"), err, wxSysErrorMsg(err));
+}
 
-  wxLog::OnLog(wxLOG_Error, s_szBuf);
+void WXDLLIMPEXP_BASE wxVLogSysError(const wxString& format, va_list argptr)
+{
+    wxVLogSysError(wxSysErrorCode(), format, argptr);
 }
 
-void WXDLLEXPORT wxLogSysError(wxTString strFormat, ...)
+#if !wxUSE_UTF8_LOCALE_ONLY
+void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(const wxChar *format, ...)
 {
-  va_list argptr;
-  va_start(argptr, strFormat);
-  vsprintf(s_szBuf, strFormat, argptr);
-  va_end(argptr);
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogSysError(format, argptr);
+    va_end(argptr);
+}
+#endif // !wxUSE_UTF8_LOCALE_ONLY
 
-  wxLogSysErrorHelper(wxSysErrorCode());
+#if wxUSE_UNICODE_UTF8
+void WXDLLIMPEXP_BASE wxDoLogSysErrorUtf8(const char *format, ...)
+{
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogSysError(format, argptr);
+    va_end(argptr);
 }
+#endif // wxUSE_UNICODE_UTF8
 
-void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...)
+void WXDLLIMPEXP_BASE wxVLogSysError(long err, const wxString& format, va_list argptr)
 {
-  va_list argptr;
-  va_start(argptr, strFormat);
-  vsprintf(s_szBuf, strFormat, argptr);
-  va_end(argptr);
+    if ( wxLog::IsEnabled() ) {
+        wxLog::OnLog(wxLOG_Error,
+                     wxString::FormatV(format, argptr) + wxLogSysErrorHelper(err),
+                     time(NULL));
+    }
+}
 
-  wxLogSysErrorHelper(lErrCode);
+#if !wxUSE_UTF8_LOCALE_ONLY
+void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(long lErrCode, const wxChar *format, ...)
+{
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogSysError(lErrCode, format, argptr);
+    va_end(argptr);
 }
+#endif // !wxUSE_UTF8_LOCALE_ONLY
 
-// ----------------------------------------------------------------------------
-// wxLog class implementation
-// ----------------------------------------------------------------------------
+#if wxUSE_UNICODE_UTF8
+void WXDLLIMPEXP_BASE wxDoLogSysErrorUtf8(long lErrCode, const char *format, ...)
+{
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogSysError(lErrCode, format, argptr);
+    va_end(argptr);
+}
+#endif // wxUSE_UNICODE_UTF8
 
-wxLog::wxLog()
+#ifdef __WATCOMC__
+// workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
+void WXDLLIMPEXP_BASE wxDoLogSysErrorWchar(unsigned long lErrCode, const wxChar *format, ...)
 {
-  m_bHasMessages = FALSE;
-  m_bVerbose     = FALSE;
-  m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
-  m_ulTraceMask  = (wxTraceMask)0;        // -1 to set all bits
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogSysError(lErrCode, format, argptr);
+    va_end(argptr);
 }
 
-wxLog *wxLog::GetActiveTarget() 
-{ 
-  if ( !ms_bInitialized ) {
-    // prevent infinite recursion if someone calls wxLogXXX() from
-    // wxApp::CreateLogTarget()
-    ms_bInitialized = TRUE;
+void WXDLLIMPEXP_BASE wxVLogSysError(unsigned long err, const wxString& format, va_list argptr)
+    { wxVLogSysError((long)err, format, argptr); }
+#endif // __WATCOMC__
 
-    #ifdef  WX_TEST_MINIMAL
-      ms_pLogger = new wxLogStderr;
-    #else
-      // ask the application to create a log target for us
-      ms_pLogger = wxTheApp->CreateLogTarget();
-    #endif
+// ----------------------------------------------------------------------------
+// wxLog class implementation
+// ----------------------------------------------------------------------------
 
-    // do nothing if it fails - what can we do?
-  }
+unsigned wxLog::LogLastRepeatIfNeeded()
+{
+    wxCRIT_SECT_LOCKER(lock, GetPreviousLogCS());
 
-  return ms_pLogger; 
+    return LogLastRepeatIfNeededUnlocked();
 }
 
-wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
-{ 
-  // flush the old messages before changing
-  if ( ms_pLogger != NULL )
-    ms_pLogger->Flush();
-
-  ms_bInitialized = TRUE;
+unsigned wxLog::LogLastRepeatIfNeededUnlocked()
+{
+    const unsigned count = ms_prevCounter;
+
+    if ( ms_prevCounter )
+    {
+        wxString msg;
+#if wxUSE_INTL
+        msg.Printf(wxPLURAL("The previous message repeated once.",
+                            "The previous message repeated %lu times.",
+                            ms_prevCounter),
+                   ms_prevCounter);
+#else
+        msg.Printf(wxS("The previous message was repeated %lu times."),
+                   ms_prevCounter);
+#endif
+        ms_prevCounter = 0;
+        ms_prevString.clear();
+        DoLog(ms_prevLevel, msg, ms_prevTimeStamp);
+    }
 
-  wxLog *pOldLogger = ms_pLogger; 
-  ms_pLogger = pLogger; 
-  return pOldLogger; 
+    return count;
 }
 
-void wxLog::DoLog(wxLogLevel level, const char *szString)
+wxLog::~wxLog()
 {
-  wxString str;
-
-  // prepend a timestamp if not disabled
-  if ( !IsEmpty(m_szTimeFormat) ) {
-    char szBuf[128];
-    time_t timeNow;
-    struct tm *ptmNow;
-
-    time(&timeNow);
-    ptmNow = localtime(&timeNow);
-
-    strftime(szBuf, WXSIZEOF(szBuf), m_szTimeFormat, ptmNow);
-    str = szBuf;
-  }
-
-  switch ( level ) {
-    case wxLOG_FatalError:
-      DoLogString(str << _("Fatal error: ") << szString);
-      DoLogString(_("Program aborted."));
-      Flush();
-      abort();
-      break;
-
-    case wxLOG_Error:
-      DoLogString(str << _("Error: ") << szString);
-      break;
-
-    case wxLOG_Warning:
-      DoLogString(str << _("Warning: ") << szString);
-      break;
-
-    case wxLOG_Info:
-      if ( GetVerbose() )
-    case wxLOG_Message:
-        DoLogString(str + szString);
-      // fall through
-
-    case wxLOG_Status:
-      // nothing to do
-      break;
-
-    case wxLOG_Trace:
-    case wxLOG_Debug:
-      #ifdef __DEBUG__
-        #ifdef  __WIN32__
-          // in addition to normal logging, also send the string to debugger
-          // (don't prepend "Debug" here: it will go to debug window anyhow)
-          ::OutputDebugString(str + szString + "\n\r");
-        #endif  //Win32
-        DoLogString(str << (level == wxLOG_Trace ? "Trace" : "Debug")
-                        << ": " << szString);
-      #endif
-            
-      break;
-
-    default:
-      wxFAIL_MSG("unknown log level in wxLog::DoLog");
-  }
+    // Flush() must be called before destroying the object as otherwise some
+    // messages could be lost
+    if ( ms_prevCounter )
+    {
+        wxMessageOutputDebug().Printf
+        (
+            wxS("Last repeated message (\"%s\", %lu times) wasn't output"),
+            ms_prevString,
+            ms_prevCounter
+        );
+    }
 }
 
-void wxLog::DoLogString(const char *szString)
+/* static */
+void wxLog::OnLog(wxLogLevel level, const wxString& szString, time_t t)
 {
-  wxFAIL_MSG("DoLogString must be overrided if it's called.");
+    if ( IsEnabled() && ms_logLevel >= level )
+    {
+        wxLog *pLogger = GetActiveTarget();
+        if ( pLogger )
+        {
+            if ( GetRepetitionCounting() )
+            {
+                wxCRIT_SECT_LOCKER(lock, GetPreviousLogCS());
+
+                if ( szString == ms_prevString )
+                {
+                    ms_prevCounter++;
+
+                    // nothing else to do, in particular, don't log the
+                    // repeated message
+                    return;
+                }
+
+                pLogger->LogLastRepeatIfNeededUnlocked();
+
+                // reset repetition counter for a new message
+                ms_prevString = szString;
+                ms_prevLevel = level;
+                ms_prevTimeStamp = t;
+            }
+
+            pLogger->DoLog(level, szString, t);
+        }
+    }
 }
 
-void wxLog::Flush()
+// deprecated function
+#if WXWIN_COMPATIBILITY_2_6
+
+wxChar *wxLog::SetLogBuffer(wxChar * WXUNUSED(buf), size_t WXUNUSED(size))
 {
-  // do nothing
+    return NULL;
 }
 
-// ----------------------------------------------------------------------------
-// wxLogStderr class implementation
-// ----------------------------------------------------------------------------
+#endif // WXWIN_COMPATIBILITY_2_6
 
-wxLogStderr::wxLogStderr(FILE *fp)
+#if WXWIN_COMPATIBILITY_2_8
+
+void wxLog::DoLog(wxLogLevel WXUNUSED(level),
+                  const char *WXUNUSED(szString),
+                  time_t WXUNUSED(t))
 {
-  if ( fp == NULL )
-    m_fp = stderr;
-  else
-    m_fp = fp;
 }
 
-void wxLogStderr::DoLogString(const char *szString)
+void wxLog::DoLog(wxLogLevel WXUNUSED(level),
+                  const wchar_t *WXUNUSED(wzString),
+                  time_t WXUNUSED(t))
 {
-  fputs(szString, m_fp);
-  fputc('\n', m_fp);
-  fflush(m_fp);
 }
 
-// ----------------------------------------------------------------------------
-// wxLogStream implementation
-// ----------------------------------------------------------------------------
+#endif // WXWIN_COMPATIBILITY_2_8
 
-wxLogStream::wxLogStream(ostream *ostr)
+wxLog *wxLog::GetActiveTarget()
 {
-  if ( ostr == NULL )
-    m_ostr = &cerr;
-  else
-    m_ostr = ostr;
+    if ( ms_bAutoCreate && ms_pLogger == NULL ) {
+        // prevent infinite recursion if someone calls wxLogXXX() from
+        // wxApp::CreateLogTarget()
+        static bool s_bInGetActiveTarget = false;
+        if ( !s_bInGetActiveTarget ) {
+            s_bInGetActiveTarget = true;
+
+            // ask the application to create a log target for us
+            if ( wxTheApp != NULL )
+                ms_pLogger = wxTheApp->GetTraits()->CreateLogTarget();
+            else
+                ms_pLogger = new wxLogStderr;
+
+            s_bInGetActiveTarget = false;
+
+            // do nothing if it fails - what can we do?
+        }
+    }
+
+    return ms_pLogger;
 }
 
-void wxLogStream::DoLogString(const char *szString)
+wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
 {
-  (*m_ostr) << szString << endl << flush;
+    if ( ms_pLogger != NULL ) {
+        // flush the old messages before changing because otherwise they might
+        // get lost later if this target is not restored
+        ms_pLogger->Flush();
+    }
+
+    wxLog *pOldLogger = ms_pLogger;
+    ms_pLogger = pLogger;
+
+    return pOldLogger;
 }
 
-// ----------------------------------------------------------------------------
-// wxLogTextCtrl implementation
-// ----------------------------------------------------------------------------
-wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
-// @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
-#ifndef __GTK__
-             : wxLogStream(new ostream(pTextCtrl))
-#endif //GTK
+void wxLog::DontCreateOnDemand()
 {
+    ms_bAutoCreate = false;
+
+    // this is usually called at the end of the program and we assume that it
+    // is *always* called at the end - so we free memory here to avoid false
+    // memory leak reports from wxWin  memory tracking code
+    ClearTraceMasks();
 }
 
-wxLogTextCtrl::~wxLogTextCtrl()
+void wxLog::DoCreateOnDemand()
 {
-  #ifndef __GTK__
-    delete m_ostr;
-  #endif //GTK
+    ms_bAutoCreate = true;
 }
 
-// ----------------------------------------------------------------------------
-// wxLogGui implementation
-// ----------------------------------------------------------------------------
+void wxLog::AddTraceMask(const wxString& str)
+{
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());
 
-#ifndef   WX_TEST_MINIMAL
+    ms_aTraceMasks.push_back(str);
+}
 
-wxLogGui::wxLogGui()
+void wxLog::RemoveTraceMask(const wxString& str)
 {
-  m_bErrors = FALSE;
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());
+
+    int index = ms_aTraceMasks.Index(str);
+    if ( index != wxNOT_FOUND )
+        ms_aTraceMasks.RemoveAt((size_t)index);
 }
 
-void wxLogGui::Flush()
+void wxLog::ClearTraceMasks()
 {
-  if ( !m_bHasMessages )
-    return;
-
-  // @@@ ugly...
-  
-  // concatenate all strings (but not too many to not overfill the msg box)
-  wxString str;
-  uint nLines    = 0, 
-       nMsgCount = m_aMessages.Count();
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());
 
-  // start from the most recent message
-  for ( uint n = nMsgCount; n > 0; n-- ) {
-    // for Windows strings longer than this value are wrapped (NT 4.0)
-    const uint nMsgLineWidth = 156;
+    ms_aTraceMasks.Clear();
+}
 
-    nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
+void wxLog::TimeStamp(wxString *str)
+{
+#if wxUSE_DATETIME
+    if ( !ms_timestamp.empty() )
+    {
+        wxChar buf[256];
+        time_t timeNow;
+        (void)time(&timeNow);
+
+        struct tm tm;
+        wxStrftime(buf, WXSIZEOF(buf),
+                    ms_timestamp, wxLocaltime_r(&timeNow, &tm));
+
+        str->Empty();
+        *str << buf << wxS(": ");
+    }
+#endif // wxUSE_DATETIME
+}
 
-    if ( nLines > 25 )  // don't put too many lines in message box
-      break;
+void wxLog::DoLog(wxLogLevel level, const wxString& szString, time_t t)
+{
+#if WXWIN_COMPATIBILITY_2_8
+    // DoLog() signature changed since 2.8, so we call the old versions here
+    // so that existing custom log classes still work:
+    DoLog(level, (const char*)szString.mb_str(), t);
+    DoLog(level, (const wchar_t*)szString.wc_str(), t);
+#endif
 
-    str << m_aMessages[n - 1] << "\n";
-  }
+    switch ( level ) {
+        case wxLOG_FatalError:
+            LogString(_("Fatal error: ") + szString, t);
+            LogString(_("Program aborted."), t);
+            Flush();
+#ifdef __WXWINCE__
+            ExitThread(3);
+#else
+            abort();
+#endif
+            break;
+
+        case wxLOG_Error:
+            LogString(_("Error: ") + szString, t);
+            break;
+
+        case wxLOG_Warning:
+            LogString(_("Warning: ") + szString, t);
+            break;
+
+        case wxLOG_Info:
+            if ( GetVerbose() )
+        case wxLOG_Message:
+        case wxLOG_Status:
+        default:    // log unknown log levels too
+                LogString(szString, t);
+            break;
+
+        case wxLOG_Trace:
+        case wxLOG_Debug:
+#ifdef __WXDEBUG__
+            {
+                wxString msg = level == wxLOG_Trace ? wxS("Trace: ")
+                                                    : wxS("Debug: ");
+                msg << szString;
+                LogString(msg, t);
+            }
+#endif // Debug
+            break;
+    }
+}
 
-  if ( m_bErrors ) {
-    wxMessageBox(str, _("Error"), wxOK | wxICON_EXCLAMATION);
-  }
-  else {
-    wxMessageBox(str, _("Information"), wxOK | wxICON_INFORMATION);
-  }
+void wxLog::DoLogString(const wxString& szString, time_t t)
+{
+#if WXWIN_COMPATIBILITY_2_8
+    // DoLogString() signature changed since 2.8, so we call the old versions
+    // here so that existing custom log classes still work; unfortunately this
+    // also means that we can't have the wxFAIL_MSG below in compat mode
+    DoLogString((const char*)szString.mb_str(), t);
+    DoLogString((const wchar_t*)szString.wc_str(), t);
+#else
+    wxFAIL_MSG(wxS("DoLogString must be overriden if it's called."));
+    wxUnusedVar(szString);
+    wxUnusedVar(t);
+#endif
+}
 
-  // no undisplayed messages whatsoever
-  m_bHasMessages =
-  m_bErrors      = FALSE;
-  m_aMessages.Empty();
+void wxLog::Flush()
+{
+    LogLastRepeatIfNeeded();
 }
 
-// the default behaviour is to discard all informational messages if there
-// are any errors/warnings.
-void wxLogGui::DoLog(wxLogLevel level, const char *szString)
+/*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask)
 {
-  switch ( level ) {
-    case wxLOG_Info:
-      if ( GetVerbose() )
-    case wxLOG_Message:
-        if ( !m_bErrors ) {
-          m_aMessages.Add(szString);
-          m_bHasMessages = TRUE;
-        }
-      break;
-
-    case wxLOG_Status:
-      {
-        // find the top window and set it's status text if it has any
-        wxWindow *pWin = wxTheApp->GetTopWindow();
-        if ( pWin != NULL && pWin->IsKindOf(CLASSINFO(wxFrame)) ) {
-          wxFrame *pFrame = (wxFrame *)pWin;
-          pFrame->SetStatusText(szString);
-        }
-      }
-      break;
-
-    case wxLOG_Trace:
-    case wxLOG_Debug:
-      #ifdef __DEBUG__
-        #ifdef  __WIN32__
-          OutputDebugString(szString);
-          OutputDebugString("\n\r");
-        #else   //!WIN32
-          // send them to stderr
-          fprintf(stderr, level == wxLOG_Trace ? "Trace: %s\n" 
-                                               : "Debug: %s\n", szString);
-          fflush(stderr);
-        #endif  // WIN32
-      #endif
-      break;
-
-    case wxLOG_FatalError:
-      // show this one immediately
-      wxMessageBox(szString, "Fatal error", wxICON_HAND);
-      break;
-
-    case wxLOG_Error:
-    case wxLOG_Warning:
-      // discard earlier informational messages if this is the 1st error
-      if ( !m_bErrors ) {
-        m_aMessages.Empty();
-        m_bHasMessages = TRUE;
-        m_bErrors = TRUE;
-      }
+    wxCRIT_SECT_LOCKER(lock, GetTraceMaskCS());
+
+    for ( wxArrayString::iterator it = ms_aTraceMasks.begin(),
+                                  en = ms_aTraceMasks.end();
+         it != en; ++it )
+    {
+        if ( *it == mask)
+            return true;
+    }
 
-      m_aMessages.Add(szString);
-      break;
-    
-    default:
-      wxFAIL_MSG("unknown log level in wxLogGui::DoLog");
-  }
+    return false;
 }
 
 // ----------------------------------------------------------------------------
-// wxLogWindow implementation
+// wxLogBuffer implementation
 // ----------------------------------------------------------------------------
 
-// log frame class
-class wxLogFrame : public wxFrame
+void wxLogBuffer::Flush()
 {
-public:
-  // ctor
-  wxLogFrame(const char *szTitle);
-
-  // menu callbacks
-  void OnClose(wxCommandEvent& event);
-  void OnCloseWindow(wxCloseEvent& event);
-  void OnSave (wxCommandEvent& event);
-  void OnClear(wxCommandEvent& event);
-
-  // accessors
-  wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
-
-private:
-  enum
-  {
-    Menu_Close = 100,
-    Menu_Save,
-    Menu_Clear
-  };
-
-  wxTextCtrl *m_pTextCtrl;
-
-  DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
-  // wxLogWindow menu events
-  EVT_MENU(Menu_Close, wxLogFrame::OnClose)
-  EVT_MENU(Menu_Save,  wxLogFrame::OnSave)
-  EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
-
-  EVT_CLOSE(wxLogFrame::OnCloseWindow)
-END_EVENT_TABLE() 
+    if ( !m_str.empty() )
+    {
+        wxMessageOutputBest out;
+        out.Printf(wxS("%s"), m_str.c_str());
+        m_str.clear();
+    }
+}
 
-wxLogFrame::wxLogFrame(const char *szTitle)
-          : wxFrame(NULL, -1, szTitle)
+void wxLogBuffer::DoLog(wxLogLevel level, const wxString& szString, time_t t)
 {
-  // we don't want to be a top-level frame because it would prevent the
-  // application termination when all other frames are closed
-  wxTopLevelWindows.DeleteObject(this);
+    switch ( level )
+    {
+        case wxLOG_Trace:
+        case wxLOG_Debug:
+#ifdef __WXDEBUG__
+            // don't put debug messages in the buffer, we don't want to show
+            // them to the user in a msg box, log them immediately
+            {
+                wxString str;
+                TimeStamp(&str);
+                str += szString;
+
+                wxMessageOutputDebug dbgout;
+                dbgout.Printf(wxS("%s\n"), str.c_str());
+            }
+#endif // __WXDEBUG__
+            break;
+
+        default:
+            wxLog::DoLog(level, szString, t);
+    }
+}
 
-  // @@ kludge: wxSIMPLE_BORDER is simply to prevent wxWindows from creating
-  //    a rich edit control instead of a normal one we want
-  m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
-                               wxDefaultSize,
-                               wxSIMPLE_BORDER |
-                               wxTE_MULTILINE  |
-                               wxHSCROLL       |
-                               wxTE_READONLY);
-  /*
-  m_pTextCtrl->SetEditable(FALSE);
-  m_pTextCtrl->SetRichEdit(FALSE);
-  */
+void wxLogBuffer::DoLogString(const wxString& szString, time_t WXUNUSED(t))
+{
+    m_str << szString << wxS("\n");
+}
 
-  // create menu
-  wxMenuBar *pMenuBar = new wxMenuBar;
-  wxMenu *pMenu = new wxMenu;
-  pMenu->Append(Menu_Save,  "&Save...");
-  pMenu->Append(Menu_Clear, "C&lear");
-  pMenu->AppendSeparator();
-  pMenu->Append(Menu_Close, "&Close");
-  pMenuBar->Append(pMenu, "&Log");
-  SetMenuBar(pMenuBar);
+// ----------------------------------------------------------------------------
+// wxLogStderr class implementation
+// ----------------------------------------------------------------------------
 
-  // @@ what about status bar? needed (for menu prompts)?
+wxLogStderr::wxLogStderr(FILE *fp)
+{
+    if ( fp == NULL )
+        m_fp = stderr;
+    else
+        m_fp = fp;
 }
 
-void wxLogFrame::OnClose(wxCommandEvent& event)
+void wxLogStderr::DoLogString(const wxString& szString, time_t WXUNUSED(t))
 {
-  // just hide the window
-  Show(FALSE);
+    wxString str;
+    TimeStamp(&str);
+    str << szString;
+
+    wxFputs(str, m_fp);
+    wxFputc(wxS('\n'), m_fp);
+    fflush(m_fp);
+
+    // under GUI systems such as Windows or Mac, programs usually don't have
+    // stderr at all, so show the messages also somewhere else, typically in
+    // the debugger window so that they go at least somewhere instead of being
+    // simply lost
+    if ( m_fp == stderr )
+    {
+        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+        if ( traits && !traits->HasStderr() )
+        {
+            wxMessageOutputDebug dbgout;
+            dbgout.Printf(wxS("%s\n"), str.c_str());
+        }
+    }
 }
 
-void wxLogFrame::OnCloseWindow(wxCloseEvent& event)
+// ----------------------------------------------------------------------------
+// wxLogStream implementation
+// ----------------------------------------------------------------------------
+
+#if wxUSE_STD_IOSTREAM
+#include "wx/ioswrap.h"
+wxLogStream::wxLogStream(wxSTD ostream *ostr)
 {
-  // just hide the window
-  Show(FALSE);
+    if ( ostr == NULL )
+        m_ostr = &wxSTD cerr;
+    else
+        m_ostr = ostr;
 }
 
-void wxLogFrame::OnSave(wxCommandEvent& event)
+void wxLogStream::DoLogString(const wxString& szString, time_t WXUNUSED(t))
 {
-  // get the file name
-  // -----------------
-  const char *szFileName = wxSaveFileSelector("log", "txt", "log.txt");
-  if ( szFileName == NULL ) {
-    // cancelled
-    return;
-  }
+    wxString stamp;
+    TimeStamp(&stamp);
+    (*m_ostr) << stamp << szString << wxSTD endl;
+}
+#endif // wxUSE_STD_IOSTREAM
 
-  // open file
-  // ---------
-  wxFile file;
-  bool bOk;
-  if ( wxFile::Exists(szFileName) ) {
-    bool bAppend;
-    wxString strMsg;
-    strMsg.Printf(_("Append log to file '%s' "
-                    "(choosing [No] will overwrite it)?"), szFileName);
-    switch ( wxMessageBox(strMsg, "Question", wxYES_NO | wxCANCEL) ) {
-      case wxYES:
-        bAppend = TRUE;
-        break;
-
-      case wxNO:
-        bAppend = FALSE;
-        break;
-
-      case wxCANCEL:
-        return;
-
-      default:
-        wxFAIL_MSG("invalid message box return value");
-    }
+// ----------------------------------------------------------------------------
+// wxLogChain
+// ----------------------------------------------------------------------------
 
-    if ( bAppend ) {
-      bOk = file.Open(szFileName, wxFile::write_append);
-    }
-    else {
-      bOk = file.Create(szFileName, TRUE /* overwrite */);
-    }
-  }
-  else {
-    bOk = file.Create(szFileName);
-  }
+wxLogChain::wxLogChain(wxLog *logger)
+{
+    m_bPassMessages = true;
 
-  // retrieve text and save it
-  // -------------------------
-  
-#ifdef __GTK__
-  // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
-  wxLogError("Sorry, this function is not implemented under GTK");
-#else
-  int nLines = m_pTextCtrl->GetNumberOfLines();
-  for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {
-    bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL());
-  }
-#endif //GTK
-  
-  if ( bOk )
-    bOk = file.Close();
-
-  if ( !bOk ) {
-    wxLogError("Can't save log contents to file.");
-    return;
-  }
+    m_logNew = logger;
+    m_logOld = wxLog::SetActiveTarget(this);
 }
 
-void wxLogFrame::OnClear(wxCommandEvent& event)
+wxLogChain::~wxLogChain()
 {
-  m_pTextCtrl->Clear();
-}
+    delete m_logOld;
 
-wxLogWindow::wxLogWindow(const wxTString& strTitle, bool bShow)
-{
-  m_pOldLog = wxLog::GetActiveTarget();
-  m_pLogFrame = new wxLogFrame(strTitle);
-  
-  if ( bShow )
-    m_pLogFrame->Show(TRUE);
+    if ( m_logNew != this )
+        delete m_logNew;
 }
 
-void wxLogWindow::Show(bool bShow)
+void wxLogChain::SetLog(wxLog *logger)
 {
-  m_pLogFrame->Show(bShow);
+    if ( m_logNew != this )
+        delete m_logNew;
+
+    m_logNew = logger;
 }
 
-void wxLogWindow::DoLog(wxLogLevel level, const char *szString)
+void wxLogChain::Flush()
 {
-  // first let the previous logger show it
-  if ( m_pOldLog != NULL ) {
-    // @@@ why can't we access protected wxLog method from here (we derive 
-    // from wxLog)? gcc gives "DoLog is protected in this context", what
-    // does this mean? Anyhow, the cast is harmless and let's us do what
-    // we want.
-    ((wxLogWindow *)m_pOldLog)->DoLog(level, szString);
-  }
-  
-  // and this will format it nicely and call our DoLogString()
-  wxLog::DoLog(level, szString);
+    if ( m_logOld )
+        m_logOld->Flush();
+
+    // be careful to avoid infinite recursion
+    if ( m_logNew && m_logNew != this )
+        m_logNew->Flush();
 }
 
-void wxLogWindow::DoLogString(const char *szString)
+void wxLogChain::DoLog(wxLogLevel level, const wxString& szString, time_t t)
 {
-  // put the text into our window
-  wxTextCtrl *pText = m_pLogFrame->TextCtrl();
+    // let the previous logger show it
+    if ( m_logOld && IsPassingMessages() )
+    {
+        // bogus cast just to access protected DoLog
+        ((wxLogChain *)m_logOld)->DoLog(level, szString, t);
+    }
 
-  // remove selection (WriteText is in fact ReplaceSelection)
-  #ifdef __WINDOWS__
-    long nLen = pText->GetLastPosition();
-    pText->SetSelection(nLen, nLen);
-  #endif // Windows
+    if ( m_logNew && m_logNew != this )
+    {
+        // as above...
+        ((wxLogChain *)m_logNew)->DoLog(level, szString, t);
+    }
+}
 
-  pText->WriteText(szString);
-  pText->WriteText("\n"); // "\n" ok here (_not_ "\r\n")
+#ifdef __VISUALC__
+    // "'this' : used in base member initializer list" - so what?
+    #pragma warning(disable:4355)
+#endif // VC++
 
-  // ensure that the line can be seen
-  // @@@ TODO
+// ----------------------------------------------------------------------------
+// wxLogInterposer
+// ----------------------------------------------------------------------------
+
+wxLogInterposer::wxLogInterposer()
+                : wxLogChain(this)
+{
 }
 
-wxLogWindow::~wxLogWindow()
+// ----------------------------------------------------------------------------
+// wxLogInterposerTemp
+// ----------------------------------------------------------------------------
+
+wxLogInterposerTemp::wxLogInterposerTemp()
+                : wxLogChain(this)
 {
-  m_pLogFrame->Close(TRUE);
+    DetachOldLog();
 }
 
-#endif  //WX_TEST_MINIMAL
+#ifdef __VISUALC__
+    #pragma warning(default:4355)
+#endif // VC++
 
 // ============================================================================
 // Global functions/variables
@@ -704,8 +962,26 @@ wxLogWindow::~wxLogWindow()
 // ----------------------------------------------------------------------------
 // static variables
 // ----------------------------------------------------------------------------
-wxLog      *wxLog::ms_pLogger      = NULL;
-bool        wxLog::ms_bInitialized = FALSE;
+
+bool            wxLog::ms_bRepetCounting = false;
+wxString        wxLog::ms_prevString;
+unsigned int    wxLog::ms_prevCounter = 0;
+time_t          wxLog::ms_prevTimeStamp= 0;
+wxLogLevel      wxLog::ms_prevLevel;
+
+wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;
+bool            wxLog::ms_doLog        = true;
+bool            wxLog::ms_bAutoCreate  = true;
+bool            wxLog::ms_bVerbose     = false;
+
+wxLogLevel      wxLog::ms_logLevel     = wxLOG_Max;  // log everything by default
+
+size_t          wxLog::ms_suspendCount = 0;
+
+wxString        wxLog::ms_timestamp(wxS("%X"));  // time only, no date
+
+wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
+wxArrayString   wxLog::ms_aTraceMasks;
 
 // ----------------------------------------------------------------------------
 // stdout error logging helper
@@ -714,33 +990,33 @@ bool        wxLog::ms_bInitialized = FALSE;
 // helper function: wraps the message and justifies it under given position
 // (looks more pretty on the terminal). Also adds newline at the end.
 //
-// @@ this is now disabled until I find a portable way of determining the
-//    terminal window size (ok, I found it but does anybody really cares?)
-#ifdef    LOG_PRETTY_WRAP
+// TODO this is now disabled until I find a portable way of determining the
+//      terminal window size (ok, I found it but does anybody really cares?)
+#ifdef LOG_PRETTY_WRAP
 static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
 {
-  size_t nMax = 80; // @@@@
-  size_t nStart = strlen(pszPrefix);
-  fputs(pszPrefix, f);
-
-  size_t n;
-  while ( *psz != '\0' ) {
-    for ( n = nStart; (n < nMax) && (*psz != '\0'); n++ )
-      putc(*psz++, f);
-
-    // wrapped?
-    if ( *psz != '\0' ) {
-      /*putc('\n', f);*/
-      for ( n = 0; n < nStart; n++ )
-        putc(' ', f);
-
-      // as we wrapped, squeeze all white space
-      while ( isspace(*psz) )
-        psz++;
+    size_t nMax = 80; // FIXME
+    size_t nStart = strlen(pszPrefix);
+    fputs(pszPrefix, f);
+
+    size_t n;
+    while ( *psz != '\0' ) {
+        for ( n = nStart; (n < nMax) && (*psz != '\0'); n++ )
+            putc(*psz++, f);
+
+        // wrapped?
+        if ( *psz != '\0' ) {
+            /*putc('\n', f);*/
+            for ( n = 0; n < nStart; n++ )
+                putc(' ', f);
+
+            // as we wrapped, squeeze all white space
+            while ( isspace(*psz) )
+                psz++;
+        }
     }
-  }
 
-  putc('\n', f);
+    putc('\n', f);
 }
 #endif  //LOG_PRETTY_WRAP
 
@@ -751,108 +1027,78 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
 // get error code from syste
 unsigned long wxSysErrorCode()
 {
-  #ifdef  __WINDOWS__
-    #ifdef  __WIN32__
-      return ::GetLastError();
-    #else   //WIN16
-      // @@@@ what to do on Windows 3.1?
-      return 0;
-    #endif  //WIN16/32
-  #else   //Unix
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+    return ::GetLastError();
+#else   //Unix
     return errno;
-  #endif  //Win/Unix
+#endif  //Win/Unix
 }
 
 // get error message from system
-const char *wxSysErrorMsg(unsigned long nErrCode)
-{
-  if ( nErrCode == 0 )
-    nErrCode = wxSysErrorCode();
-
-  #ifdef  __WINDOWS__
-    #ifdef  __WIN32__
-      static char s_szBuf[LOG_BUFFER_SIZE / 2];
-
-      // get error message from system
-      LPVOID lpMsgBuf;
-      FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                    NULL, nErrCode, 
-                    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                    (LPTSTR)&lpMsgBuf,
-                    0, NULL);
-
-      // copy it to our buffer and free memory
-      strncpy(s_szBuf, (const char *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
-      s_szBuf[WXSIZEOF(s_szBuf) - 1] = '\0';
-      LocalFree(lpMsgBuf);
-
-      // returned string is capitalized and ended with '\r\n' - bad
-      s_szBuf[0] = (char)tolower(s_szBuf[0]);
-      size_t len = strlen(s_szBuf);
-      if ( len > 0 ) {
-        // truncate string
-        if ( s_szBuf[len - 2] == '\r' )
-          s_szBuf[len - 2] = '\0';
-      }
-
-      return s_szBuf;
-    #else   //Win16
-      // TODO @@@@
-      return NULL;
-    #endif // Win16/32
-  #else   // Unix
-    return strerror(nErrCode);
-  #endif  // Win/Unix
-}
-
-// ----------------------------------------------------------------------------
-// debug helper
-// ----------------------------------------------------------------------------
+const wxChar *wxSysErrorMsg(unsigned long nErrCode)
+{
+    if ( nErrCode == 0 )
+        nErrCode = wxSysErrorCode();
+
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+    static wxChar s_szBuf[1024];
+
+    // get error message from system
+    LPVOID lpMsgBuf;
+    if ( ::FormatMessage
+         (
+            FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+            NULL,
+            nErrCode,
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+            (LPTSTR)&lpMsgBuf,
+            0,
+            NULL
+         ) == 0 )
+    {
+        // if this happens, something is seriously wrong, so don't use _() here
+        // for safety
+        wxSprintf(s_szBuf, wxS("unknown error %lx"), nErrCode);
+        return s_szBuf;
+    }
 
-#ifdef  __DEBUG__
 
-// this function is called when an assert fails
-void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
-{
-  // this variable can be set to true to suppress "assert failure" messages
-  static s_bNoAsserts = FALSE;
+    // copy it to our buffer and free memory
+    // Crashes on SmartPhone (FIXME)
+#if !defined(__SMARTPHONE__) /* of WinCE */
+    if( lpMsgBuf != 0 )
+    {
+        wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
+        s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxS('\0');
 
-  char szBuf[LOG_BUFFER_SIZE];
-  sprintf(szBuf, _("Assert failed in file %s at line %d"), szFile, nLine);
-  if ( szMsg != NULL ) {
-    strcat(szBuf, ": ");
-    strcat(szBuf, szMsg);
-  }
-  else {
-    strcat(szBuf, ".");
-  }
+        LocalFree(lpMsgBuf);
 
-  // send it to the normal log destination
-  wxLogDebug(szBuf);
-
-  if ( !s_bNoAsserts ) {
-    strcat(szBuf, _("\nDo you want to stop the program?"
-                    "\nYou can also choose [Cancel] to suppress "
-                    "further warnings."));
-
-    switch ( wxMessageBox(szBuf, _("Debug"),
-                          wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
-      case wxYES:
-        #ifdef __WINDOWS__
-          DebugBreak();
-        #else // Unix
-          raise(SIGTRAP);
-        #endif // Win/Unix
-        break;
-
-      case wxCANCEL:
-        s_bNoAsserts = TRUE;
-        break;
-        
-      //case wxNO: nothing to do
+        // returned string is capitalized and ended with '\r\n' - bad
+        s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
+        size_t len = wxStrlen(s_szBuf);
+        if ( len > 0 ) {
+            // truncate string
+            if ( s_szBuf[len - 2] == wxS('\r') )
+                s_szBuf[len - 2] = wxS('\0');
+        }
+    }
+    else
+#endif // !__SMARTPHONE__
+    {
+        s_szBuf[0] = wxS('\0');
     }
-  }
-}
 
-#endif  //DEBUG
+    return s_szBuf;
+#else // !__WXMSW__
+    #if wxUSE_UNICODE
+        static wchar_t s_wzBuf[1024];
+        wxConvCurrent->MB2WC(s_wzBuf, strerror((int)nErrCode),
+                             WXSIZEOF(s_wzBuf) - 1);
+        return s_wzBuf;
+    #else
+        return strerror((int)nErrCode);
+    #endif
+#endif  // __WXMSW__/!__WXMSW__
+}
 
+#endif // wxUSE_LOG