fix for d_mars 8.35

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 53de91f0468de6fd0058ebe7643ca95f0e00ef91..4da49d8fe959ee21f37fecf98ac655c5bba88c75 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "log.h"
 #endif
 
     #pragma implementation "log.h"
 #endif
 


@@ -33,6 +33,7 @@
 // wxWindows
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 // wxWindows
 #ifndef WX_PRECOMP
     #include "wx/app.h"

+    #include "wx/arrstr.h"

     #include "wx/intl.h"
     #include "wx/string.h"
 #endif //WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/string.h"
 #endif //WX_PRECOMP


@@ -47,9 +48,21 @@
 #include "wx/wxchar.h"
 
 // other standard headers
 #include "wx/wxchar.h"
 
 // other standard headers

+#ifndef __WXWINCE__

 #include <errno.h>
 #include <errno.h>

+#endif
+

 #include <stdlib.h>
 #include <stdlib.h>

+
+#ifndef __WXWINCE__

 #include <time.h>
 #include <time.h>

+#else
+#include "wx/msw/wince/time.h"
+#endif
+
+#if defined(__WINDOWS__)
+    #include "wx/msw/private.h" // includes windows.h
+#endif

 
 // ----------------------------------------------------------------------------
 // non member functions
 
 // ----------------------------------------------------------------------------
 // non member functions


@@ -174,7 +187,11 @@ void wxVLogFatalError(const wxChar *szFormat, va_list argptr)
 
     wxSafeShowMessage(_T("Fatal Error"), s_szBuf);
 
 
     wxSafeShowMessage(_T("Fatal Error"), s_szBuf);
 

+#ifdef __WXWINCE__
+    ExitThread(3);
+#else

     abort();
     abort();

+#endif

 }
 
 void wxLogFatalError(const wxChar *szFormat, ...)
 }
 
 void wxLogFatalError(const wxChar *szFormat, ...)


@@ -380,7 +397,7 @@ wxLog *wxLog::GetActiveTarget()
 
             // ask the application to create a log target for us
             if ( wxTheApp != NULL )
 
             // ask the application to create a log target for us
             if ( wxTheApp != NULL )

-                ms_pLogger = wxTheApp->CreateLogTarget();
+                ms_pLogger = wxTheApp->GetTraits()->CreateLogTarget();

             else
                 ms_pLogger = new wxLogStderr;
 
             else
                 ms_pLogger = new wxLogStderr;
 


@@ -421,7 +438,7 @@ void wxLog::RemoveTraceMask(const wxString& str)
 {
     int index = ms_aTraceMasks.Index(str);
     if ( index != wxNOT_FOUND )
 {
     int index = ms_aTraceMasks.Index(str);
     if ( index != wxNOT_FOUND )

-        ms_aTraceMasks.Remove((size_t)index);
+        ms_aTraceMasks.RemoveAt((size_t)index);

 }
 
 void wxLog::ClearTraceMasks()
 }
 
 void wxLog::ClearTraceMasks()


@@ -450,7 +467,11 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
             DoLogString(wxString(_("Fatal error: ")) + szString, t);
             DoLogString(_("Program aborted."), t);
             Flush();
             DoLogString(wxString(_("Fatal error: ")) + szString, t);
             DoLogString(_("Program aborted."), t);
             Flush();

+#ifdef __WXWINCE__
+            ExitThread(3);
+#else

             abort();
             abort();

+#endif

             break;
 
         case wxLOG_Error:
             break;
 
         case wxLOG_Error:


@@ -493,6 +514,16 @@ void wxLog::Flush()
     // nothing to do here
 }
 
     // nothing to do here
 }
 

+/*static*/ bool wxLog::IsAllowedTraceMask(const wxChar *mask)
+{
+    for ( wxArrayString::iterator it = ms_aTraceMasks.begin(),
+                                  en = ms_aTraceMasks.end();
+         it != en; ++it )
+        if ( *it == mask)
+            return true;
+    return false;
+}
+

 // ----------------------------------------------------------------------------
 // wxLogStderr class implementation
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxLogStderr class implementation
 // ----------------------------------------------------------------------------