Improved selection mode handling in wxGrid::SelectBlock

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 129b25305474894316e6ec4d15d5c0da8921f609..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);
 
     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);
       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));
       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__
         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;
     }
 }
             break;
     }
 }


@@ -434,6 +453,8 @@ wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;
 bool            wxLog::ms_doLog        = TRUE;
 bool            wxLog::ms_bAutoCreate  = TRUE;
 
 bool            wxLog::ms_doLog        = TRUE;
 bool            wxLog::ms_bAutoCreate  = TRUE;
 

+size_t          wxLog::ms_suspendCount = 0;
+

 #if wxUSE_GUI
     const wxChar *wxLog::ms_timestamp  = wxT("%X");  // time only, no date
 #else
 #if wxUSE_GUI
     const wxChar *wxLog::ms_timestamp  = wxT("%X");  // time only, no date
 #else