More work on getting wxLisBox events right

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

diff --git a/include/wx/log.h b/include/wx/log.h
index a3cf858c4fa98be288b0c1693e29ef18ec11c228..01d37ca61d04a4da56d2aa0aabf88058f2754247 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -14,8 +14,6 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#include "wx/thread.h"
-

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


@@ -53,9 +51,11 @@ typedef unsigned long wxLogLevel;
 
 #include "wx/arrstr.h"
 
 
 #include "wx/arrstr.h"
 

+#ifndef __WXPALMOS5__

 #ifndef __WXWINCE__
     #include <time.h>   // for time_t
 #endif
 #ifndef __WXWINCE__
     #include <time.h>   // for time_t
 #endif

+#endif // ! __WXPALMOS5__

 
 #include "wx/dynarray.h"
 
 
 #include "wx/dynarray.h"
 


@@ -198,8 +198,7 @@ public:
     static void SetTraceMask(wxTraceMask ulMask) { ms_ulTraceMask = ulMask; }
 
     // add string trace mask
     static void SetTraceMask(wxTraceMask ulMask) { ms_ulTraceMask = ulMask; }
 
     // add string trace mask

-    static void AddTraceMask(const wxString& str)
-        { ms_aTraceMasks.push_back(str); }
+    static void AddTraceMask(const wxString& str);

 
     // add string trace mask
     static void RemoveTraceMask(const wxString& str);
 
     // add string trace mask
     static void RemoveTraceMask(const wxString& str);


@@ -207,8 +206,9 @@ public:
     // remove all string trace masks
     static void ClearTraceMasks();
 
     // remove all string trace masks
     static void ClearTraceMasks();
 

-    // get string trace masks
-    static const wxArrayString &GetTraceMasks() { return ms_aTraceMasks; }
+    // get string trace masks: note that this is MT-unsafe if other threads can
+    // call AddTraceMask() concurrently
+    static const wxArrayString& GetTraceMasks() { return ms_aTraceMasks; }

 
     // sets the time stamp string format: this is used as strftime() format
     // string for the log targets which add time stamps to the messages; set
 
     // sets the time stamp string format: this is used as strftime() format
     // string for the log targets which add time stamps to the messages; set


@@ -306,9 +306,13 @@ protected:
     // 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
     // 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 LogLastRepetitionCountIfNeeded();
+    unsigned LogLastRepeatIfNeeded();

 
 private:
 
 private:

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

     // static variables
     // ----------------
 
     // static variables
     // ----------------
 


@@ -316,7 +320,6 @@ private:
     // with the number of times it was repeated
     static bool        ms_bRepetCounting;
 
     // with the number of times it was repeated
     static bool        ms_bRepetCounting;
 

-    wxCRIT_SECT_DECLARE(ms_prevCS);     // protects the ms_prev values below

     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
     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