slightly simplified wxLog repetition counting code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49403 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/log.h b/include/wx/log.h
index 254df43702c5a04ebfc1fc469bbf36c0c541e4ca..adab3ceb5baa5169a231eaa8b3af890b107faa0a 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -301,20 +301,20 @@ protected:
     #define wxSUPPRESS_DOLOGSTRING_HIDE_WARNING()
 #endif
 
-    // log a line containing the number of times the previous message was
-    // repeated
-    // returns: the number
-    static unsigned DoLogNumberOfRepeats();
+    // log a message indicating the number of times the previous message was
+    // repeated; only does something if ms_prevCounter > 0
+    static void LogLastRepetitionCountIfNeeded();
 
 private:
     // static variables
     // ----------------
 
-    // traditional behaviour or counting repetitions
+    // if true, don't log the same message multiple times, only log it once
+    // with the number of times it was repeated
     static bool        ms_bRepetCounting;
+
     static wxString    ms_prevString;   // previous message that was logged
-    // how many times the previous message was logged
-    static unsigned    ms_prevCounter;
+    static unsigned    ms_prevCounter;  // how many times it was repeated
     static time_t      ms_prevTimeStamp;// timestamp of the previous message
     static wxLogLevel  ms_prevLevel;    // level of the previous message
 

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 89ed1264fcb3fca2087408c1c0772a2e9902122a..03d6f0adf4ab98289f3ca2948c23e09d1c5ba498 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -458,11 +458,10 @@ void WXDLLEXPORT wxVLogSysError(unsigned long err, const wxString& format, va_li
 // ----------------------------------------------------------------------------
 
 /* static */
-unsigned wxLog::DoLogNumberOfRepeats()
+void wxLog::LogLastRepetitionCountIfNeeded()
 {
-    long retval = ms_prevCounter;
     wxLog *pLogger = GetActiveTarget();
-    if ( pLogger && ms_prevCounter > 0 )
+    if ( pLogger && ms_prevCounter )
     {
         wxString msg;
 #if wxUSE_INTL
@@ -471,23 +470,18 @@ 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);
     }
-    return retval;
 }
 
 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 +492,26 @@ 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() )
+                if ( szString == ms_prevString )
                 {
-                    DoLogNumberOfRepeats();
+                    ms_prevCounter++;
+
+                    // nothing else to do, in particular, don't log the
+                    // repeated message
+                    return;
                 }
+
+                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);
         }
     }
 }