compilation fix for STL build; also don't pass unknown string potentially containing...

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 250b7b3924495804bc89de222025249efa338ac3..262477de4003838aa9cd3995f574f28f6dd39816 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -490,7 +490,17 @@ unsigned wxLog::LogLastRepeatIfNeededUnlocked()
 
 wxLog::~wxLog()
 {
 
 wxLog::~wxLog()
 {

-    LogLastRepeatIfNeeded();
+    // Flush() must be called before destroying the object as otherwise some
+    // messages could be lost
+    if ( ms_prevCounter )
+    {
+        wxMessageOutputDebug().Printf
+        (
+            wxS("Last repeated message (\"%s\", %lu times) wasn't output"),
+            ms_prevString,
+            ms_prevCounter
+        );
+    }

 }
 
 /* static */
 }
 
 /* static */


@@ -705,7 +715,7 @@ void wxLog::DoLogString(const wxString& szString, time_t t)
 
 void wxLog::Flush()
 {
 
 void wxLog::Flush()
 {

-    // nothing to do here
+    LogLastRepeatIfNeeded();

 }
 
 /*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask)
 }
 
 /*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask)