X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4ffdb64018ac4e4d76c57914d02f8547bf445683..e1db4c1290af151b0d85c4dcad7cbb2414e0d474:/src/common/log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index e5070691dd..6b2f3a0456 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -53,13 +53,11 @@
 
 #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
@@ -213,7 +211,14 @@ wxLogFormatter::Format(wxLogLevel level,
                        const wxString& msg,
                        const wxLogRecordInfo& info) const
 {
-    wxString prefix = FormatTime(info.timestamp);
+    wxString prefix;
+
+    // don't time stamp debug messages under MSW as debug viewers usually
+    // already have an option to do it
+#ifdef __WXMSW__
+    if ( level != wxLOG_Debug && level != wxLOG_Trace )
+#endif // __WXMSW__
+        prefix = FormatTime(info.timestamp);
 
     switch ( level )
     {
@@ -247,13 +252,7 @@ wxString
 wxLogFormatter::FormatTime(time_t t) const
 {
     wxString str;
-
-    // don't time stamp debug messages under MSW as debug viewers usually
-    // already have an option to do it
-#ifdef __WXMSW__
-    if ( level != wxLOG_Debug && level != wxLOG_Trace )
-#endif // __WXMSW__
-        wxLog::TimeStamp(&str, t);
+    wxLog::TimeStamp(&str, t);
 
     return str;
 }
@@ -354,11 +353,7 @@ wxLog::OnLog(wxLogLevel level,
     {
         wxSafeShowMessage(wxS("Fatal Error"), msg);
 
-#ifdef __WXWINCE__
-        ExitThread(3);
-#else
-        abort();
-#endif
+        wxAbort();
     }
 
     wxLog *logger;