remove wxTextAttr::CreateFont(); return wxNullFont from GetFont() if we have no font...

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 250b7b3924495804bc89de222025249efa338ac3..ddb361a2547b2cc3253bfc15ea17033f727ee32b 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -51,11 +51,13 @@
 
 #include <stdlib.h>
 
+#ifndef __WXPALMOS5__
 #ifndef __WXWINCE__
 #include <time.h>
 #else
 #include "wx/msw/wince/time.h"
 #endif
+#endif /* ! __WXPALMOS5__ */
 
 #if defined(__WINDOWS__)
     #include "wx/msw/private.h" // includes windows.h
@@ -490,7 +492,17 @@ unsigned wxLog::LogLastRepeatIfNeededUnlocked()
 
 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 */
@@ -705,7 +717,7 @@ void wxLog::DoLogString(const wxString& szString, time_t t)
 
 void wxLog::Flush()
 {
-    // nothing to do here
+    LogLastRepeatIfNeeded();
 }
 
 /*static*/ bool wxLog::IsAllowedTraceMask(const wxString& mask)