Fixed a rare wxAuiFloatingFrame dtor crash on MSW using a registration mechanism...

[wxWidgets.git] / include / wx / log.h

diff --git a/include/wx/log.h b/include/wx/log.h
index 254df43702c5a04ebfc1fc469bbf36c0c541e4ca..a4d800e62342da52523abad8ac21f70f957d5cbb 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -14,6 +14,10 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

+#if wxUSE_THREADS
+    class WXDLLIMPEXP_FWD_BASE wxCriticalSection;
+#endif
+

 // ----------------------------------------------------------------------------
 // common constants for use in wxUSE_LOG/!wxUSE_LOG
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // common constants for use in wxUSE_LOG/!wxUSE_LOG
 // ----------------------------------------------------------------------------


@@ -301,20 +305,28 @@ protected:
     #define wxSUPPRESS_DOLOGSTRING_HIDE_WARNING()
 #endif
 
     #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 if ms_prevCounter > 0, does nothing otherwise; return the old
+    // value of ms_prevCounter
+    unsigned LogLastRepeatIfNeeded();

 
 private:
 
 private:

+    // implement of LogLastRepeatIfNeeded(): it assumes that the
+    // caller had already locked ms_prevCS
+    unsigned LogLastRepeatIfNeededUnlocked();
+

     // static variables
     // ----------------
 
     // 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 bool        ms_bRepetCounting;

+
+#if wxUSE_THREADS
+    static wxCriticalSection ms_prevCS; // protects the ms_prev values below
+#endif

     static wxString    ms_prevString;   // previous message that was logged
     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
 
     static time_t      ms_prevTimeStamp;// timestamp of the previous message
     static wxLogLevel  ms_prevLevel;    // level of the previous message