add wxAppConsoleBase::OnEventLoopEnter/Exit callbacks; add wxEventLoopBase::IsMain...

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

diff --git a/include/wx/log.h b/include/wx/log.h
index a4f1168db6252efe27e2f8109323da369b76618c..5a2c119abc7b41beaa96bc427d5b9c6de0d08d83 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -14,10 +14,6 @@
 
 #include "wx/defs.h"
 
-#if wxUSE_THREADS
-    class WXDLLIMPEXP_FWD_BASE wxCriticalSection;
-#endif
-
 // ----------------------------------------------------------------------------
 // common constants for use in wxUSE_LOG/!wxUSE_LOG
 // ----------------------------------------------------------------------------
@@ -247,6 +243,14 @@ public:
     // change it otherwise)
     static void TimeStamp(wxString *str);
 
+    // this method should only be called from derived classes DoLog()
+    // implementations and shouldn't be called directly, use logging functions
+    // instead
+    void Log(wxLogLevel level, const wxString& msg, time_t t)
+    {
+        DoLog(level, msg, t);
+    }
+
     // make dtor virtual for all derived classes
     virtual ~wxLog();
 
@@ -260,7 +264,7 @@ public:
 #endif
 
 protected:
-    // the logging functions that can be overriden
+    // the logging functions that can be overridden
 
     // default DoLog() prepends the time stamp and a prefix corresponding
     // to the message to szString and then passes it to DoLogString()
@@ -324,9 +328,6 @@ private:
     // with the number of times it was repeated
     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 unsigned    ms_prevCounter;  // how many times it was repeated
     static time_t      ms_prevTimeStamp;// timestamp of the previous message
@@ -345,9 +346,6 @@ private:
     // disabled
     static wxString    ms_timestamp;
 
-#if wxUSE_THREADS
-    static wxCriticalSection ms_traceCS; // protects ms_aTraceMasks
-#endif
     static wxTraceMask ms_ulTraceMask;   // controls wxLogTrace behaviour
     static wxArrayString ms_aTraceMasks; // more powerful filter for wxLogTrace
 };
@@ -379,7 +377,7 @@ protected:
 private:
     wxString m_str;
 
-    DECLARE_NO_COPY_CLASS(wxLogBuffer)
+    wxDECLARE_NO_COPY_CLASS(wxLogBuffer);
 };
 
 
@@ -388,7 +386,7 @@ class WXDLLIMPEXP_BASE wxLogStderr : public wxLog
 {
 public:
     // redirect log output to a FILE
-    wxLogStderr(FILE *fp = (FILE *) NULL);
+    wxLogStderr(FILE *fp = NULL);
 
 protected:
     // implement sink function
@@ -398,7 +396,7 @@ protected:
 
     FILE *m_fp;
 
-    DECLARE_NO_COPY_CLASS(wxLogStderr)
+    wxDECLARE_NO_COPY_CLASS(wxLogStderr);
 };
 
 #if wxUSE_STD_IOSTREAM
@@ -502,7 +500,7 @@ private:
     // do we pass the messages to the old logger?
     bool m_bPassMessages;
 
-    DECLARE_NO_COPY_CLASS(wxLogChain)
+    wxDECLARE_NO_COPY_CLASS(wxLogChain);
 };
 
 // a chain log target which uses itself as the new logger
@@ -515,7 +513,7 @@ public:
     wxLogInterposer();
 
 private:
-    DECLARE_NO_COPY_CLASS(wxLogInterposer)
+    wxDECLARE_NO_COPY_CLASS(wxLogInterposer);
 };
 
 // a temporary interposer which doesn't destroy the old log target
@@ -527,7 +525,7 @@ public:
     wxLogInterposerTemp();
 
 private:
-    DECLARE_NO_COPY_CLASS(wxLogInterposerTemp)
+    wxDECLARE_NO_COPY_CLASS(wxLogInterposerTemp);
 };
 
 #if wxUSE_GUI
@@ -761,7 +759,14 @@ DECLARE_LOG_FUNCTION2(SysError, unsigned long, lErrCode);
     // empty functions if their parameters are complicated enough, but by
     // defining them as an empty inline function we ensure that even dumbest
     // compilers optimise them away
+#ifdef __BORLANDC__
+    // but Borland gives "W8019: Code has no effect" for wxLogNop() so we need
+    // to define it differently for it to avoid these warnings (same problem as
+    // with wxUnusedVar())
+    #define wxLogNop() { }
+#else
     inline void wxLogNop() { }
+#endif
 
     #define wxVLogDebug(fmt, valist) wxLogNop()
     #define wxVLogTrace(mask, fmt, valist) wxLogNop()