Better fix

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

diff --git a/include/wx/log.h b/include/wx/log.h
index bff6f448c3d667a20b5cd2533010e2dc48f18eb2..4d9523604271ef8422f6d77a1c594350411e4b3e 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -14,7 +14,9 @@
 
 #include "wx/defs.h"
 
-#include "wx/thread.h"
+#if wxUSE_THREADS
+    class WXDLLIMPEXP_FWD_BASE wxCriticalSection;
+#endif
 
 // ----------------------------------------------------------------------------
 // common constants for use in wxUSE_LOG/!wxUSE_LOG
@@ -53,9 +55,11 @@ typedef unsigned long wxLogLevel;
 
 #include "wx/arrstr.h"
 
+#ifndef __WXPALMOS5__
 #ifndef __WXWINCE__
     #include <time.h>   // for time_t
 #endif
+#endif // ! __WXPALMOS5__
 
 #include "wx/dynarray.h"
 
@@ -304,10 +308,15 @@ protected:
 #endif
 
     // log a message indicating the number of times the previous message was
-    // repeated; only does something if ms_prevCounter > 0
-    static void LogLastRepetitionCountIfNeeded();
+    // repeated if ms_prevCounter > 0, does nothing otherwise; return the old
+    // value of ms_prevCounter
+    unsigned LogLastRepeatIfNeeded();
 
 private:
+    // implement of LogLastRepeatIfNeeded(): it assumes that the
+    // caller had already locked ms_prevCS
+    unsigned LogLastRepeatIfNeededUnlocked();
+
     // static variables
     // ----------------
 
@@ -315,7 +324,9 @@ private:
     // with the number of times it was repeated
     static bool        ms_bRepetCounting;
 
-    wxCRIT_SECT_DECLARE(ms_prevCS);     // protects the ms_prev values below
+#if wxUSE_THREADS
+    static wxCriticalSection ms_prevCS; // protects the ms_prev values below
+#endif
     static wxString    ms_prevString;   // previous message that was logged
     static unsigned    ms_prevCounter;  // how many times it was repeated
     static time_t      ms_prevTimeStamp;// timestamp of the previous message