Don't block in wxEventLoopManual::Dispatch() if loop was exited.

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index e5070691dd430645208edab7be966f222212917e..5135eadaa33799aa29055274cdba6870b0bbdb6a 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -53,13 +53,11 @@
 
 #include <stdlib.h>
 
 
 #include <stdlib.h>
 

-#ifndef __WXPALMOS5__

 #ifndef __WXWINCE__
 #include <time.h>
 #else
 #include "wx/msw/wince/time.h"
 #endif
 #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
 
 #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
 {
                        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 __WINDOWS__
+    if ( level != wxLOG_Debug && level != wxLOG_Trace )
+#endif // __WINDOWS__
+        prefix = FormatTime(info.timestamp);

 
     switch ( level )
     {
 
     switch ( level )
     {


@@ -227,7 +232,7 @@ wxLogFormatter::Format(wxLogLevel level,
 
         // don't prepend "debug/trace" prefix under MSW as it goes to the debug
         // window anyhow and so can't be confused with something else
 
         // don't prepend "debug/trace" prefix under MSW as it goes to the debug
         // window anyhow and so can't be confused with something else

-#ifndef __WXMSW__
+#ifndef __WINDOWS__

     case wxLOG_Debug:
         // this prefix (as well as the one below) is intentionally not
         // translated as nobody translates debug messages anyhow
     case wxLOG_Debug:
         // this prefix (as well as the one below) is intentionally not
         // translated as nobody translates debug messages anyhow


@@ -237,7 +242,7 @@ wxLogFormatter::Format(wxLogLevel level,
     case wxLOG_Trace:
         prefix += "Trace: ";
         break;
     case wxLOG_Trace:
         prefix += "Trace: ";
         break;

-#endif // !__WXMSW__
+#endif // !__WINDOWS__

     }
 
     return prefix + msg;
     }
 
     return prefix + msg;


@@ -247,13 +252,7 @@ wxString
 wxLogFormatter::FormatTime(time_t t) const
 {
     wxString str;
 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;
 }
 
     return str;
 }


@@ -354,11 +353,7 @@ wxLog::OnLog(wxLogLevel level,
     {
         wxSafeShowMessage(wxS("Fatal Error"), msg);
 
     {
         wxSafeShowMessage(wxS("Fatal Error"), msg);
 

-#ifdef __WXWINCE__
-        ExitThread(3);
-#else
-        abort();
-#endif
+        wxAbort();

     }
 
     wxLog *logger;
     }
 
     wxLog *logger;


@@ -1053,7 +1048,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
 // get error code from syste
 unsigned long wxSysErrorCode()
 {
 // get error code from syste
 unsigned long wxSysErrorCode()
 {

-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)

     return ::GetLastError();
 #else   //Unix
     return errno;
     return ::GetLastError();
 #else   //Unix
     return errno;


@@ -1066,7 +1061,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
     if ( nErrCode == 0 )
         nErrCode = wxSysErrorCode();
 
     if ( nErrCode == 0 )
         nErrCode = wxSysErrorCode();
 

-#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#if defined(__WINDOWS__) && !defined(__WXMICROWIN__)

     static wxChar s_szBuf[1024];
 
     // get error message from system
     static wxChar s_szBuf[1024];
 
     // get error message from system


@@ -1114,7 +1109,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
     }
 
     return s_szBuf;
     }
 
     return s_szBuf;

-#else // !__WXMSW__
+#else // !__WINDOWS__

     #if wxUSE_UNICODE
         static wchar_t s_wzBuf[1024];
         wxConvCurrent->MB2WC(s_wzBuf, strerror((int)nErrCode),
     #if wxUSE_UNICODE
         static wchar_t s_wzBuf[1024];
         wxConvCurrent->MB2WC(s_wzBuf, strerror((int)nErrCode),


@@ -1123,7 +1118,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
     #else
         return strerror((int)nErrCode);
     #endif
     #else
         return strerror((int)nErrCode);
     #endif

-#endif  // __WXMSW__/!__WXMSW__
+#endif  // __WINDOWS__/!__WINDOWS__

 }
 
 #endif // wxUSE_LOG
 }
 
 #endif // wxUSE_LOG