some != NULL checks

[wxWidgets.git] / src / common / log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 6d99576b99d69f9ca5e3a448fe7fd15c5c462516..0a44516706601ee688aec1259de45885ad99212c 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -178,9 +178,23 @@ void wxLogVerbose(const wxChar *szFormat, ...)
     if ( pLog != NULL && wxLog::IsAllowedTraceMask(mask) ) {
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
+      wxChar *p = s_szBuf;
+      size_t len = WXSIZEOF(s_szBuf);
+      strncpy(s_szBuf, _T("("), len);
+      len -= 1; // strlen("(")
+      p += 1;
+      strncat(p, mask, len);
+      size_t lenMask = wxStrlen(mask);
+      len -= lenMask;
+      p += lenMask;
+
+      strncat(p, _T(") "), len);
+      len -= 2;
+      p += 2;
+
       va_list argptr;
       va_start(argptr, szFormat);
-      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+      wxVsnprintf(p, len, szFormat, argptr);
       va_end(argptr);
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
@@ -355,8 +369,13 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
         case wxLOG_Trace:
         case wxLOG_Debug:
 #ifdef __WXDEBUG__
-            DoLogString(szString, t);
-#endif
+            {
+                wxString msg = level == wxLOG_Trace ? wxT("Trace: ")
+                                                    : wxT("Debug: ");
+                msg << szString;
+                DoLogString(msg, t);
+            }
+#endif // Debug
             break;
     }
 }
@@ -398,6 +417,9 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 #if defined(__WXMSW__) && wxUSE_GUI
     OutputDebugString(str + wxT("\r\n"));
 #endif // MSW
+#if defined(__WXMAC__) && wxUSE_GUI
+    debugstr(str + wxT("\r\n"));
+#endif // MSW
 }
 
 // ----------------------------------------------------------------------------
@@ -431,7 +453,13 @@ wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;
 bool            wxLog::ms_doLog        = TRUE;
 bool            wxLog::ms_bAutoCreate  = TRUE;
 
-const wxChar   *wxLog::ms_timestamp    = wxT("%X");  // time only, no date
+size_t          wxLog::ms_suspendCount = 0;
+
+#if wxUSE_GUI
+    const wxChar *wxLog::ms_timestamp  = wxT("%X");  // time only, no date
+#else
+    const wxChar *wxLog::ms_timestamp  = NULL;       // save space
+#endif
 
 wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 wxArrayString   wxLog::ms_aTraceMasks;