X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a20d2ced0a0779b5d8b1cc8064f8404b2727e92..1abfa172c547a37751e598084fb8d541071471a3:/src/common/log.cpp?ds=inline

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 113d202158..c2a69b6714 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -42,7 +42,7 @@
 #include "wx/msgout.h"
 #include "wx/textfile.h"
 #include "wx/thread.h"
-#include "wx/wxchar.h"
+#include "wx/crt.h"
 
 // other standard headers
 #ifndef __WXWINCE__
@@ -157,7 +157,7 @@ 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);
@@ -457,12 +457,13 @@ void WXDLLEXPORT wxVLogSysError(unsigned long err, const wxString& format, va_li
 // wxLog class implementation
 // ----------------------------------------------------------------------------
 
-/* static */
-unsigned wxLog::DoLogNumberOfRepeats()
+unsigned wxLog::LogLastRepetitionCountIfNeeded()
 {
-    long retval = ms_prevCounter;
-    wxLog *pLogger = GetActiveTarget();
-    if ( pLogger && ms_prevCounter > 0 )
+    wxCRIT_SECT_LOCKER(lock, ms_prevCS);
+
+    const unsigned count = ms_prevCounter;
+
+    if ( ms_prevCounter )
     {
         wxString msg;
 #if wxUSE_INTL
@@ -471,23 +472,20 @@ unsigned wxLog::DoLogNumberOfRepeats()
                             ms_prevCounter),
                    ms_prevCounter);
 #else
-        msg.Printf(wxT("The previous message was repeated."));
+        msg.Printf(wxT("The previous message was repeated %lu times."),
+                   ms_prevCounter);
 #endif
         ms_prevCounter = 0;
         ms_prevString.clear();
-        pLogger->DoLog(ms_prevLevel, msg, ms_prevTimeStamp);
+        DoLog(ms_prevLevel, msg, ms_prevTimeStamp);
     }
-    return retval;
+
+    return count;
 }
 
 wxLog::~wxLog()
 {
-    if ( ms_prevCounter > 0 )
-    {
-        // looks like the repeat count has not been logged yet,
-        // so let's do it now
-        wxLog::DoLogNumberOfRepeats();
-    }
+    LogLastRepetitionCountIfNeeded();
 }
 
 /* static */
@@ -498,21 +496,28 @@ void wxLog::OnLog(wxLogLevel level, const wxString& szString, time_t t)
         wxLog *pLogger = GetActiveTarget();
         if ( pLogger )
         {
-            if ( GetRepetitionCounting() && ms_prevString == szString )
-            {
-                ms_prevCounter++;
-            }
-            else
+            if ( GetRepetitionCounting() )
             {
-                if ( GetRepetitionCounting() )
+                wxCRIT_SECT_LOCKER(lock, ms_prevCS);
+
+                if ( szString == ms_prevString )
                 {
-                    DoLogNumberOfRepeats();
+                    ms_prevCounter++;
+
+                    // nothing else to do, in particular, don't log the
+                    // repeated message
+                    return;
                 }
+
+                pLogger->LogLastRepetitionCountIfNeeded();
+
+                // reset repetition counter for a new message
                 ms_prevString = szString;
                 ms_prevLevel = level;
                 ms_prevTimeStamp = t;
-                pLogger->DoLog(level, szString, t);
             }
+
+            pLogger->DoLog(level, szString, t);
         }
     }
 }
@@ -527,6 +532,22 @@ wxChar *wxLog::SetLogBuffer(wxChar * WXUNUSED(buf), size_t WXUNUSED(size))
 
 #endif // WXWIN_COMPATIBILITY_2_6
 
+#if WXWIN_COMPATIBILITY_2_8
+
+void wxLog::DoLog(wxLogLevel WXUNUSED(level),
+                  const char *WXUNUSED(szString),
+                  time_t WXUNUSED(t))
+{
+}
+
+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 ) {
@@ -595,7 +616,7 @@ void wxLog::ClearTraceMasks()
 void wxLog::TimeStamp(wxString *str)
 {
 #if wxUSE_DATETIME
-    if ( ms_timestamp )
+    if ( !ms_timestamp.empty() )
     {
         wxChar buf[256];
         time_t timeNow;
@@ -849,18 +870,28 @@ void wxLogChain::DoLog(wxLogLevel level, const wxString& 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__
@@ -875,6 +906,9 @@ wxLogPassThrough::wxLogPassThrough()
 // static variables
 // ----------------------------------------------------------------------------
 
+#if wxUSE_THREADS
+wxCriticalSection wxLog::ms_prevCS;
+#endif // wxUSE_THREADS
 bool            wxLog::ms_bRepetCounting = false;
 wxString        wxLog::ms_prevString;
 unsigned int    wxLog::ms_prevCounter = 0;
@@ -890,7 +924,7 @@ wxLogLevel      wxLog::ms_logLevel     = wxLOG_Max;  // log everything by defaul
 
 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;