Avoid needless second string conversion when adding files to memory FS.

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 7cc809d803653468d3edb89fdc12f390e36ca501..6b2f3a045616e91a180bd31762656f4340ca02b2 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


@@ -355,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;