X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..c7db82dced50cce6ac8440a442a8fd3f6e25c2ab:/src/common/log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 4da49d8fe9..89ed1264fc 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        log.cpp
+// Name:        src/common/log.cpp
 // Purpose:     Assorted wxLogXXX functions, and wxLog (sink for logs)
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "log.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -30,22 +26,23 @@
 
 #if wxUSE_LOG
 
-// wxWindows
+// 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/apptrait.h"
+#include "wx/datetime.h"
 #include "wx/file.h"
-#include "wx/log.h"
 #include "wx/msgout.h"
 #include "wx/textfile.h"
 #include "wx/thread.h"
-#include "wx/utils.h"
-#include "wx/wxchar.h"
+#include "wx/crt.h"
 
 // other standard headers
 #ifndef __WXWINCE__
@@ -79,33 +76,6 @@
 // implementation
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// globals
-// ----------------------------------------------------------------------------
-
-// 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
-static wxChar   s_szBufStatic[LOG_BUFFER_SIZE];
-
-static wxChar  *s_szBuf     = s_szBufStatic;
-static size_t   s_szBufSize = WXSIZEOF( s_szBufStatic );
-
-#if wxUSE_THREADS
-
-// the critical section protecting the static buffer
-static wxCriticalSection gs_csLogBuf;
-
-#endif // wxUSE_THREADS
-
-// return true if we have a non NULL non disabled log target
-static inline bool IsLoggingEnabled()
-{
-    return wxLog::IsEnabled() && (wxLog::GetActiveTarget() != NULL);
-}
-
 // ----------------------------------------------------------------------------
 // implementation of Log functions
 //
@@ -113,56 +83,70 @@ static inline bool IsLoggingEnabled()
 //     macros and not all compilers inline vararg functions.
 // ----------------------------------------------------------------------------
 
-// wrapper for wxVsnprintf(s_szBuf) which always NULL-terminates it
-static inline void PrintfInLogBug(const wxChar *szFormat, va_list argptr)
+// generic log function
+void wxVLogGeneric(wxLogLevel level, const wxString& format, va_list argptr)
 {
-    if ( wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr) < 0 )
-    {
-        // must NUL-terminate it manually
-        s_szBuf[s_szBufSize - 1] = _T('\0');
+    if ( wxLog::IsEnabled() ) {
+        wxLog::OnLog(level, wxString::FormatV(format, argptr), time(NULL));
     }
-    //else: NUL-terminated by vsnprintf()
 }
 
-// generic log function
-void wxVLogGeneric(wxLogLevel level, const wxChar *szFormat, va_list argptr)
+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxDoLogGenericWchar(wxLogLevel level, const wxChar *format, ...)
 {
-    if ( IsLoggingEnabled() ) {
-        wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
-
-        PrintfInLogBug(szFormat, argptr);
-
-        wxLog::OnLog(level, s_szBuf, time(NULL));
-    }
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogGeneric(level, format, argptr);
+    va_end(argptr);
 }
+#endif // wxUSE_UTF8_LOCALE_ONLY
 
-void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
+#if wxUSE_UNICODE_UTF8
+void wxDoLogGenericUtf8(wxLogLevel level, const char *format, ...)
 {
     va_list argptr;
-    va_start(argptr, szFormat);
-    wxVLogGeneric(level, szFormat, 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
+
+#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 wxChar *szFormat, va_list argptr)        \
+  void wxVLog##level(const wxString& format, va_list argptr)        \
   {                                                                 \
-    if ( IsLoggingEnabled() ) {                                     \
-      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
-                                                                    \
-      PrintfInLogBug(szFormat, argptr);                             \
-                                                                    \
-      wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));             \
+    if ( wxLog::IsEnabled() ) {                                     \
+      wxLog::OnLog(wxLOG_##level,                                   \
+                   wxString::FormatV(format, argptr), time(NULL));  \
     }                                                               \
   }                                                                 \
-                                                                    \
-  void wxLog##level(const wxChar *szFormat, ...)                    \
-  {                                                                 \
-    va_list argptr;                                                 \
-    va_start(argptr, szFormat);                                     \
-    wxVLog##level(szFormat, argptr);                                \
-    va_end(argptr);                                                 \
-  }
+  IMPLEMENT_LOG_FUNCTION_WCHAR(level)                               \
+  IMPLEMENT_LOG_FUNCTION_UTF8(level)
 
 IMPLEMENT_LOG_FUNCTION(Error)
 IMPLEMENT_LOG_FUNCTION(Warning)
@@ -173,19 +157,18 @@ IMPLEMENT_LOG_FUNCTION(Status)
 void wxSafeShowMessage(const wxString& title, const wxString& text)
 {
 #ifdef __WINDOWS__
-    ::MessageBox(NULL, text, title, MB_OK | MB_ICONSTOP);
+    ::MessageBox(NULL, text.wx_str(), title.wx_str(), MB_OK | MB_ICONSTOP);
 #else
     wxFprintf(stderr, _T("%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 wxChar *szFormat, va_list argptr)
+void wxVLogFatalError(const wxString& format, va_list argptr)
 {
-    wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
-
-    wxSafeShowMessage(_T("Fatal Error"), s_szBuf);
+    wxSafeShowMessage(_T("Fatal Error"), wxString::FormatV(format, argptr));
 
 #ifdef __WXWINCE__
     ExitThread(3);
@@ -194,113 +177,198 @@ void wxVLogFatalError(const wxChar *szFormat, va_list argptr)
 #endif
 }
 
-void wxLogFatalError(const wxChar *szFormat, ...)
+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxDoLogFatalErrorWchar(const wxChar *format, ...)
 {
     va_list argptr;
-    va_start(argptr, szFormat);
-    wxVLogFatalError(szFormat, argptr);
-    va_end(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
 
-// same as info, but only if 'verbose' mode is on
-void wxVLogVerbose(const wxChar *szFormat, va_list argptr)
+#if wxUSE_UNICODE_UTF8
+void wxDoLogFatalErrorUtf8(const char *format, ...)
 {
-    if ( IsLoggingEnabled() ) {
-        wxLog *pLog = wxLog::GetActiveTarget();
-        if ( pLog != NULL && pLog->GetVerbose() ) {
-            wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogFatalError(format, argptr);
 
-            wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+    // some compilers warn about unreachable code and it shouldn't matter
+    // for the others anyhow...
+    //va_end(argptr);
+}
+#endif // wxUSE_UNICODE_UTF8
 
-            wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
+// same as info, but only if 'verbose' mode is on
+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));
         }
     }
 }
 
-void wxLogVerbose(const wxChar *szFormat, ...)
+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxDoLogVerboseWchar(const wxChar *format, ...)
 {
     va_list argptr;
-    va_start(argptr, szFormat);
-    wxVLogVerbose(szFormat, argptr);
+    va_start(argptr, format);
+    wxVLogVerbose(format, argptr);
     va_end(argptr);
 }
+#endif // !wxUSE_UTF8_LOCALE_ONLY
+
+#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 __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 wxChar *szFormat, va_list argptr)        \
+  void wxVLog##level(const wxString& format, va_list argptr)        \
   {                                                                 \
-    if ( IsLoggingEnabled() ) {                                     \
-      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
-                                                                    \
-      wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);    \
-                                                                    \
-      wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));             \
+    if ( wxLog::IsEnabled() ) {                                     \
+      wxLog::OnLog(wxLOG_##level,                                   \
+                   wxString::FormatV(format, argptr), time(NULL));  \
     }                                                               \
   }                                                                 \
-  void wxLog##level(const wxChar *szFormat, ...)                    \
-  {                                                                 \
-    va_list argptr;                                                 \
-    va_start(argptr, szFormat);                                     \
-    wxVLog##level(szFormat, argptr);                                \
-    va_end(argptr);                                                 \
-  }
+  IMPLEMENT_LOG_DEBUG_FUNCTION_WCHAR(level)                         \
+  IMPLEMENT_LOG_DEBUG_FUNCTION_UTF8(level)
+
 
-  void wxVLogTrace(const wxChar *mask, const wxChar *szFormat, va_list argptr)
+  void wxVLogTrace(const wxString& mask, const wxString& format, va_list argptr)
   {
-    if ( IsLoggingEnabled() && wxLog::IsAllowedTraceMask(mask) ) {
-      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
-
-      wxChar *p = s_szBuf;
-      size_t len = s_szBufSize;
-      wxStrncpy(s_szBuf, _T("("), len);
-      len -= 1; // strlen("(")
-      p += 1;
-      wxStrncat(p, mask, len);
-      size_t lenMask = wxStrlen(mask);
-      len -= lenMask;
-      p += lenMask;
-
-      wxStrncat(p, _T(") "), len);
-      len -= 2;
-      p += 2;
-
-      wxVsnprintf(p, len, szFormat, argptr);
-
-      wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
+    if ( wxLog::IsEnabled() && wxLog::IsAllowedTraceMask(mask) ) {
+      wxString msg;
+      msg << _T("(") << mask << _T(") ") << wxString::FormatV(format, argptr);
+
+      wxLog::OnLog(wxLOG_Trace, msg, time(NULL));
     }
   }
 
-  void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)
+#if !wxUSE_UTF8_LOCALE_ONLY
+  void wxDoLogTraceWchar(const wxString& 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(const wxString& mask, const char *format, ...)
   {
     va_list argptr;
-    va_start(argptr, szFormat);
-    wxVLogTrace(mask, szFormat, argptr);
+    va_start(argptr, format);
+    wxVLogTrace(mask, format, argptr);
     va_end(argptr);
   }
+#endif // wxUSE_UNICODE_UTF8
 
-  void wxVLogTrace(wxTraceMask mask, const wxChar *szFormat, va_list argptr)
+  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 ( IsLoggingEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
-      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+    if ( wxLog::IsEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
+      wxLog::OnLog(wxLOG_Trace, wxString::FormatV(format, argptr), time(NULL));
+    }
+  }
 
-      wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+#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
 
-      wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
-    }
+#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 wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...)
+  void wxDoLogTraceWchar(const wchar_t *mask, const wxChar *format, ...)
   {
     va_list argptr;
-    va_start(argptr, szFormat);
-    wxVLogTrace(mask, szFormat, 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
@@ -311,89 +379,178 @@ 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)
 {
-    wxChar szErrMsg[LOG_BUFFER_SIZE / 2];
-    wxSnprintf(szErrMsg, WXSIZEOF(szErrMsg),
-               _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
-    wxStrncat(s_szBuf, szErrMsg, s_szBufSize - wxStrlen(s_szBuf));
+    return wxString::Format(_(" (error %ld: %s)"), err, wxSysErrorMsg(err));
+}
 
-    wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
+void WXDLLEXPORT wxVLogSysError(const wxString& format, va_list argptr)
+{
+    wxVLogSysError(wxSysErrorCode(), format, argptr);
 }
 
-void WXDLLEXPORT wxVLogSysError(const wxChar *szFormat, va_list argptr)
+#if !wxUSE_UTF8_LOCALE_ONLY
+void WXDLLEXPORT wxDoLogSysErrorWchar(const wxChar *format, ...)
 {
-    if ( IsLoggingEnabled() ) {
-        wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogSysError(format, argptr);
+    va_end(argptr);
+}
+#endif // !wxUSE_UTF8_LOCALE_ONLY
 
-        wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+#if wxUSE_UNICODE_UTF8
+void WXDLLEXPORT wxDoLogSysErrorUtf8(const char *format, ...)
+{
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogSysError(format, argptr);
+    va_end(argptr);
+}
+#endif // wxUSE_UNICODE_UTF8
 
-        wxLogSysErrorHelper(wxSysErrorCode());
+void WXDLLEXPORT wxVLogSysError(long err, const wxString& format, va_list argptr)
+{
+    if ( wxLog::IsEnabled() ) {
+        wxLog::OnLog(wxLOG_Error,
+                     wxString::FormatV(format, argptr) + wxLogSysErrorHelper(err),
+                     time(NULL));
     }
 }
 
-void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
+#if !wxUSE_UTF8_LOCALE_ONLY
+void WXDLLEXPORT wxDoLogSysErrorWchar(long lErrCode, const wxChar *format, ...)
 {
     va_list argptr;
-    va_start(argptr, szFormat);
-    wxVLogSysError(szFormat, argptr);
+    va_start(argptr, format);
+    wxVLogSysError(lErrCode, format, argptr);
     va_end(argptr);
 }
+#endif // !wxUSE_UTF8_LOCALE_ONLY
 
-void WXDLLEXPORT wxVLogSysError(long lErrCode, const wxChar *szFormat, va_list argptr)
+#if wxUSE_UNICODE_UTF8
+void WXDLLEXPORT wxDoLogSysErrorUtf8(long lErrCode, const char *format, ...)
 {
-    if ( IsLoggingEnabled() ) {
-        wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
-
-        wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
-
-        wxLogSysErrorHelper(lErrCode);
-    }
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogSysError(lErrCode, format, argptr);
+    va_end(argptr);
 }
+#endif // wxUSE_UNICODE_UTF8
 
-void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
+#ifdef __WATCOMC__
+// workaround for http://bugzilla.openwatcom.org/show_bug.cgi?id=351
+void WXDLLEXPORT wxDoLogSysErrorWchar(unsigned long lErrCode, const wxChar *format, ...)
 {
     va_list argptr;
-    va_start(argptr, szFormat);
-    wxVLogSysError(lErrCode, szFormat, argptr);
+    va_start(argptr, format);
+    wxVLogSysError(lErrCode, format, argptr);
     va_end(argptr);
 }
 
+void WXDLLEXPORT wxVLogSysError(unsigned long err, const wxString& format, va_list argptr)
+    { wxVLogSysError((long)err, format, argptr); }
+#endif // __WATCOMC__
+
 // ----------------------------------------------------------------------------
 // wxLog class implementation
 // ----------------------------------------------------------------------------
 
-wxLog::wxLog()
+/* static */
+unsigned wxLog::DoLogNumberOfRepeats()
 {
+    long retval = ms_prevCounter;
+    wxLog *pLogger = GetActiveTarget();
+    if ( pLogger && ms_prevCounter > 0 )
+    {
+        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(wxT("The previous message was repeated."));
+#endif
+        ms_prevCounter = 0;
+        ms_prevString.clear();
+        pLogger->DoLog(ms_prevLevel, msg, ms_prevTimeStamp);
+    }
+    return retval;
 }
 
-wxChar *wxLog::SetLogBuffer( wxChar *buf, size_t size)
+wxLog::~wxLog()
 {
-    wxChar *oldbuf = s_szBuf;
-
-    if( buf == 0 )
+    if ( ms_prevCounter > 0 )
     {
-        s_szBuf = s_szBufStatic;
-        s_szBufSize = WXSIZEOF( s_szBufStatic );
+        // looks like the repeat count has not been logged yet,
+        // so let's do it now
+        wxLog::DoLogNumberOfRepeats();
     }
-    else
+}
+
+/* static */
+void wxLog::OnLog(wxLogLevel level, const wxString& szString, time_t t)
+{
+    if ( IsEnabled() && ms_logLevel >= level )
     {
-        s_szBuf = buf;
-        s_szBufSize = size;
+        wxLog *pLogger = GetActiveTarget();
+        if ( pLogger )
+        {
+            if ( GetRepetitionCounting() && ms_prevString == szString )
+            {
+                ms_prevCounter++;
+            }
+            else
+            {
+                if ( GetRepetitionCounting() )
+                {
+                    DoLogNumberOfRepeats();
+                }
+                ms_prevString = szString;
+                ms_prevLevel = level;
+                ms_prevTimeStamp = t;
+                pLogger->DoLog(level, szString, t);
+            }
+        }
     }
+}
+
+// deprecated function
+#if WXWIN_COMPATIBILITY_2_6
+
+wxChar *wxLog::SetLogBuffer(wxChar * WXUNUSED(buf), size_t WXUNUSED(size))
+{
+    return NULL;
+}
+
+#endif // WXWIN_COMPATIBILITY_2_6
+
+#if WXWIN_COMPATIBILITY_2_8
+
+void wxLog::DoLog(wxLogLevel WXUNUSED(level),
+                  const char *WXUNUSED(szString),
+                  time_t WXUNUSED(t))
+{
+}
 
-    return (oldbuf == s_szBufStatic ) ? 0 : oldbuf;
+void wxLog::DoLog(wxLogLevel WXUNUSED(level),
+                  const wchar_t *WXUNUSED(wzString),
+                  time_t WXUNUSED(t))
+{
 }
 
+#endif // WXWIN_COMPATIBILITY_2_8
+
 wxLog *wxLog::GetActiveTarget()
 {
     if ( ms_bAutoCreate && ms_pLogger == NULL ) {
         // prevent infinite recursion if someone calls wxLogXXX() from
         // wxApp::CreateLogTarget()
-        static bool s_bInGetActiveTarget = FALSE;
+        static bool s_bInGetActiveTarget = false;
         if ( !s_bInGetActiveTarget ) {
-            s_bInGetActiveTarget = TRUE;
+            s_bInGetActiveTarget = true;
 
             // ask the application to create a log target for us
             if ( wxTheApp != NULL )
@@ -401,7 +558,7 @@ wxLog *wxLog::GetActiveTarget()
             else
                 ms_pLogger = new wxLogStderr;
 
-            s_bInGetActiveTarget = FALSE;
+            s_bInGetActiveTarget = false;
 
             // do nothing if it fails - what can we do?
         }
@@ -426,7 +583,7 @@ wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
 
 void wxLog::DontCreateOnDemand()
 {
-    ms_bAutoCreate = FALSE;
+    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
@@ -434,6 +591,11 @@ void wxLog::DontCreateOnDemand()
     ClearTraceMasks();
 }
 
+void wxLog::DoCreateOnDemand()
+{
+    ms_bAutoCreate = true;
+}
+
 void wxLog::RemoveTraceMask(const wxString& str)
 {
     int index = ms_aTraceMasks.Index(str);
@@ -448,24 +610,36 @@ void wxLog::ClearTraceMasks()
 
 void wxLog::TimeStamp(wxString *str)
 {
-    if ( ms_timestamp )
+#if wxUSE_DATETIME
+    if ( !ms_timestamp.empty() )
     {
         wxChar buf[256];
         time_t timeNow;
         (void)time(&timeNow);
-        wxStrftime(buf, WXSIZEOF(buf), ms_timestamp, localtime(&timeNow));
+
+        struct tm tm;
+        wxStrftime(buf, WXSIZEOF(buf),
+                    ms_timestamp, wxLocaltime_r(&timeNow, &tm));
 
         str->Empty();
         *str << buf << wxT(": ");
     }
+#endif // wxUSE_DATETIME
 }
 
-void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+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
+
     switch ( level ) {
         case wxLOG_FatalError:
-            DoLogString(wxString(_("Fatal error: ")) + szString, t);
-            DoLogString(_("Program aborted."), t);
+            LogString(_("Fatal error: ") + szString, t);
+            LogString(_("Program aborted."), t);
             Flush();
 #ifdef __WXWINCE__
             ExitThread(3);
@@ -475,11 +649,11 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
             break;
 
         case wxLOG_Error:
-            DoLogString(wxString(_("Error: ")) + szString, t);
+            LogString(_("Error: ") + szString, t);
             break;
 
         case wxLOG_Warning:
-            DoLogString(wxString(_("Warning: ")) + szString, t);
+            LogString(_("Warning: ") + szString, t);
             break;
 
         case wxLOG_Info:
@@ -487,7 +661,7 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
         case wxLOG_Message:
         case wxLOG_Status:
         default:    // log unknown log levels too
-                DoLogString(szString, t);
+                LogString(szString, t);
             break;
 
         case wxLOG_Trace:
@@ -497,16 +671,26 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
                 wxString msg = level == wxLOG_Trace ? wxT("Trace: ")
                                                     : wxT("Debug: ");
                 msg << szString;
-                DoLogString(msg, t);
+                LogString(msg, t);
             }
 #endif // Debug
             break;
     }
 }
 
-void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t))
+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(wxT("DoLogString must be overriden if it's called."));
+    wxUnusedVar(szString);
+    wxUnusedVar(t);
+#endif
 }
 
 void wxLog::Flush()
@@ -514,7 +698,7 @@ void wxLog::Flush()
     // nothing to do here
 }
 
-/*static*/ bool wxLog::IsAllowedTraceMask(const wxChar *mask)
+/*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask)
 {
     for ( wxArrayString::iterator it = ms_aTraceMasks.begin(),
                                   en = ms_aTraceMasks.end();
@@ -524,6 +708,50 @@ void wxLog::Flush()
     return false;
 }
 
+// ----------------------------------------------------------------------------
+// wxLogBuffer implementation
+// ----------------------------------------------------------------------------
+
+void wxLogBuffer::Flush()
+{
+    if ( !m_str.empty() )
+    {
+        wxMessageOutputBest out;
+        out.Printf(_T("%s"), m_str.c_str());
+        m_str.clear();
+    }
+}
+
+void wxLogBuffer::DoLog(wxLogLevel level, const wxString& szString, time_t t)
+{
+    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(_T("%s\n"), str.c_str());
+            }
+#endif // __WXDEBUG__
+            break;
+
+        default:
+            wxLog::DoLog(level, szString, t);
+    }
+}
+
+void wxLogBuffer::DoLogString(const wxString& szString, time_t WXUNUSED(t))
+{
+    m_str << szString << _T("\n");
+}
+
 // ----------------------------------------------------------------------------
 // wxLogStderr class implementation
 // ----------------------------------------------------------------------------
@@ -536,14 +764,14 @@ wxLogStderr::wxLogStderr(FILE *fp)
         m_fp = fp;
 }
 
-void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+void wxLogStderr::DoLogString(const wxString& szString, time_t WXUNUSED(t))
 {
     wxString str;
     TimeStamp(&str);
     str << szString;
 
-    fputs(str.mb_str(), m_fp);
-    fputc(_T('\n'), m_fp);
+    wxFputs(str, m_fp);
+    wxFputc(_T('\n'), m_fp);
     fflush(m_fp);
 
     // under GUI systems such as Windows or Mac, programs usually don't have
@@ -555,7 +783,8 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
         wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
         if ( traits && !traits->HasStderr() )
         {
-            wxMessageOutputDebug().Printf(_T("%s"), str.c_str());
+            wxMessageOutputDebug dbgout;
+            dbgout.Printf(_T("%s\n"), str.c_str());
         }
     }
 }
@@ -574,11 +803,11 @@ wxLogStream::wxLogStream(wxSTD ostream *ostr)
         m_ostr = ostr;
 }
 
-void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+void wxLogStream::DoLogString(const wxString& szString, time_t WXUNUSED(t))
 {
-    wxString str;
-    TimeStamp(&str);
-    (*m_ostr) << str << wxConvertWX2MB(szString) << wxSTD endl;
+    wxString stamp;
+    TimeStamp(&stamp);
+    (*m_ostr) << stamp << szString << wxSTD endl;
 }
 #endif // wxUSE_STD_IOSTREAM
 
@@ -588,7 +817,7 @@ void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 
 wxLogChain::wxLogChain(wxLog *logger)
 {
-    m_bPassMessages = TRUE;
+    m_bPassMessages = true;
 
     m_logNew = logger;
     m_logOld = wxLog::SetActiveTarget(this);
@@ -620,7 +849,7 @@ void wxLogChain::Flush()
         m_logNew->Flush();
 }
 
-void wxLogChain::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+void wxLogChain::DoLog(wxLogLevel level, const wxString& szString, time_t t)
 {
     // let the previous logger show it
     if ( m_logOld && IsPassingMessages() )
@@ -636,20 +865,30 @@ void wxLogChain::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
     }
 }
 
-// ----------------------------------------------------------------------------
-// wxLogPassThrough
-// ----------------------------------------------------------------------------
-
 #ifdef __VISUALC__
     // "'this' : used in base member initializer list" - so what?
     #pragma warning(disable:4355)
 #endif // VC++
 
-wxLogPassThrough::wxLogPassThrough()
+// ----------------------------------------------------------------------------
+// wxLogInterposer
+// ----------------------------------------------------------------------------
+
+wxLogInterposer::wxLogInterposer()
                 : wxLogChain(this)
 {
 }
 
+// ----------------------------------------------------------------------------
+// wxLogInterposerTemp
+// ----------------------------------------------------------------------------
+
+wxLogInterposerTemp::wxLogInterposerTemp()
+                : wxLogChain(this)
+{
+	DetachOldLog();
+}
+
 #ifdef __VISUALC__
     #pragma warning(default:4355)
 #endif // VC++
@@ -662,16 +901,22 @@ wxLogPassThrough::wxLogPassThrough()
 // static variables
 // ----------------------------------------------------------------------------
 
+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;
+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;
 
-const wxChar   *wxLog::ms_timestamp    = wxT("%X");  // time only, no date
+wxString        wxLog::ms_timestamp(wxT("%X"));  // time only, no date
 
 wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 wxArrayString   wxLog::ms_aTraceMasks;
@@ -721,12 +966,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
 unsigned long wxSysErrorCode()
 {
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
-#ifdef  __WIN32__
     return ::GetLastError();
-#else   //WIN16
-    // TODO what to do on Windows 3.1?
-    return 0;
-#endif  //WIN16/32
 #else   //Unix
     return errno;
 #endif  //Win/Unix
@@ -739,19 +979,33 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
         nErrCode = wxSysErrorCode();
 
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
-#ifdef  __WIN32__
-    static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
+    static wxChar s_szBuf[1024];
 
     // get error message from system
     LPVOID lpMsgBuf;
-    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-            NULL, nErrCode,
+    if ( ::FormatMessage
+         (
+            FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+            NULL,
+            nErrCode,
             MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
             (LPTSTR)&lpMsgBuf,
-            0, NULL);
+            0,
+            NULL
+         ) == 0 )
+    {
+        // if this happens, something is seriously wrong, so don't use _() here
+        // for safety
+        wxSprintf(s_szBuf, _T("unknown error %lx"), nErrCode);
+        return s_szBuf;
+    }
+
 
     // copy it to our buffer and free memory
-    if( lpMsgBuf != 0 ) {
+    // 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] = wxT('\0');
 
@@ -766,25 +1020,23 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
                 s_szBuf[len - 2] = wxT('\0');
         }
     }
-    else {
+    else
+#endif // !__SMARTPHONE__
+    {
         s_szBuf[0] = wxT('\0');
     }
 
     return s_szBuf;
-#else   //Win16
-    // TODO
-    return NULL;
-#endif // Win16/32
-#else   // Unix
-#if wxUSE_UNICODE
-    static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
-    wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);
-    return s_szBuf;
-#else
-    return strerror((int)nErrCode);
-#endif
-#endif  // Win/Unix
+#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
-