fixing warning and compile error against 10.4

[wxWidgets.git] / include / wx / private / threadinfo.h

diff --git a/include/wx/private/threadinfo.h b/include/wx/private/threadinfo.h
index 87eee51cc6f5c9f393cce6119ebfddac72665904..22cbb6ab6093b98e5ed22694fc489e28f008dbd3 100644 (file)
--- a/include/wx/private/threadinfo.h
+++ b/include/wx/private/threadinfo.h
@@ -30,7 +30,18 @@ class WXDLLIMPEXP_FWD_BASE wxLog;
 // NB: this must be a POD to be stored in TLS
 struct wxThreadSpecificInfo
 {
 // NB: this must be a POD to be stored in TLS
 struct wxThreadSpecificInfo
 {

+    // the thread-specific logger or NULL if the thread is using the global one
+    // (this is not used for the main thread which always uses the global
+    // logger)

     wxLog *logger;
     wxLog *logger;

+
+    // true if logging is currently disabled for this thread (this is also not
+    // used for the main thread which uses wxLog::ms_doLog)
+    //
+    // NB: we use a counter-intuitive "disabled" flag instead of "enabled" one
+    //     because the default, for 0-initialized struct, should be to enable
+    //     logging
+    bool loggingDisabled;

 };
 
 // currently this is defined in src/common/log.cpp
 };
 
 // currently this is defined in src/common/log.cpp