X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f96233d53ef6bdc1a9247fbf29d297a52714d76a..62c9b3d73fdf9a892a311241f1effc12dde0282a:/include/wx/log.h diff --git a/include/wx/log.h b/include/wx/log.h index a4f1168db6..aa8a00e216 100644 --- 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 // ---------------------------------------------------------------------------- @@ -324,9 +320,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 +338,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 }; @@ -388,7 +378,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 @@ -761,7 +751,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()