don't show wxLogDebug during app startup output in msg box

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/log.h b/include/wx/log.h
index 4f23682b55cbd27b9f6a5d3936bad8f81813b4cd..13230917c645bf29fa9dae7aa9c5bffc96d872f2 100644 (file)
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -302,6 +302,7 @@ public:
     virtual void Flush();
 
 protected:
     virtual void Flush();
 
 protected:

+    virtual void DoLog(wxLogLevel level, const wxChar *szString, time_t t);

     virtual void DoLogString(const wxChar *szString, time_t t);
 
 private:
     virtual void DoLogString(const wxChar *szString, time_t t);
 
 private:

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 0471c87c7646952b51226ba21b4c30d627a927e2..e8b718f05f4b89323f108cc0f358bbce2b123b71 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -536,6 +536,30 @@ void wxLogBuffer::Flush()
     }
 }
 
     }
 }
 

+void wxLogBuffer::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+{
+    switch ( level )
+    {
+        case wxLOG_Trace:
+        case wxLOG_Debug:
+#ifdef __WXDEBUG__
+            // don't put debug messages in the buffer, we don't want to show
+            // them to the user in a msg box, log them immediately
+            {
+                wxString str;
+                TimeStamp(&str);
+                str += szString;
+
+                wxMessageOutputDebug().Printf(_T("%s\n"), str.c_str());
+            }
+#endif // __WXDEBUG__
+            break;
+
+        default:
+            wxLog::DoLog(level, szString, t);
+    }
+}
+

 void wxLogBuffer::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     m_str << szString << _T("\n");
 void wxLogBuffer::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     m_str << szString << _T("\n");