fixed bug in ConvertWxToFileTime (bug 525868)

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 318f0706b30911bc5854c11f2b39781bc836968a..420c172a631a9c5f048448aa1e4ea32c3bd1b8dd 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -16,6 +16,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------

+

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


@@ -29,19 +30,17 @@
 
 // wxWindows
 #ifndef WX_PRECOMP
 
 // wxWindows
 #ifndef WX_PRECOMP

-  #include "wx/window.h"
-#ifdef __WXMSW__
-  #include "wx/msw/private.h"
-#endif
-  #include  "wx/event.h"
-  #include  "wx/app.h"
-  #include  "wx/string.h"
-  #include  "wx/intl.h"
-  #include  "wx/menu.h"
-  #include  "wx/frame.h"
-  #include  "wx/msgdlg.h"
-  #include  "wx/filedlg.h"
-  #include  "wx/textctrl.h"
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/app.h"
+
+    #if wxUSE_GUI
+        #include "wx/window.h"
+        #include "wx/msgdlg.h"
+        #ifdef __WXMSW__
+            #include "wx/msw/private.h"
+        #endif
+    #endif

 #endif //WX_PRECOMP
 
 #include  "wx/file.h"
 #endif //WX_PRECOMP
 
 #include  "wx/file.h"


@@ -49,19 +48,22 @@
 #include  "wx/utils.h"
 #include  "wx/wxchar.h"
 #include  "wx/log.h"
 #include  "wx/utils.h"
 #include  "wx/wxchar.h"
 #include  "wx/log.h"

+#include  "wx/thread.h"
+
+#if wxUSE_LOG

 
 // other standard headers
 #include  <errno.h>
 #include  <stdlib.h>
 #include  <time.h>
 
 
 // other standard headers
 #include  <errno.h>
 #include  <stdlib.h>
 #include  <time.h>
 

-#ifdef  __WXMSW__
-  #include  <windows.h>
-  // Redefines OutputDebugString if necessary
-  #include  "wx/msw/private.h"
-#else   //Unix
-  #include  <signal.h>
-#endif  //Win/Unix
+#if defined(__WXMSW__)
+  #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString
+#endif
+
+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif

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


@@ -74,17 +76,36 @@
   static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz);
 #endif
 
   static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz);
 #endif
 

+// ============================================================================
+// implementation
+// ============================================================================
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// global variables
+// globals

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-// we use a global variable to store the frame pointer for wxLogStatus - bad,
-// but it's he easiest way
-static wxFrame *gs_pFrame; // FIXME MT-unsafe
+// log functions can't allocate memory (LogError("out of memory...") should
+// work!), so we use a static buffer for all log messages
+#define LOG_BUFFER_SIZE   (4096)
+
+// static buffer for error messages
+static wxChar   s_szBufStatic[LOG_BUFFER_SIZE];

 
 

-// ============================================================================
-// implementation
-// ============================================================================
+static wxChar  *s_szBuf     = s_szBufStatic;
+static size_t   s_szBufSize = WXSIZEOF( s_szBufStatic );
+
+#if wxUSE_THREADS
+
+// the critical section protecting the static buffer
+static wxCriticalSection gs_csLogBuf;
+
+#endif // wxUSE_THREADS
+
+// return true if we have a non NULL non disabled log target
+static inline bool IsLoggingEnabled()
+{
+    return wxLog::IsEnabled() && (wxLog::GetActiveTarget() != NULL);
+}

 
 // ----------------------------------------------------------------------------
 // implementation of Log functions
 
 // ----------------------------------------------------------------------------
 // implementation of Log functions


@@ -93,124 +114,173 @@ static wxFrame *gs_pFrame; // FIXME MT-unsafe
 //     macros and not all compilers inline vararg functions.
 // ----------------------------------------------------------------------------
 
 //     macros and not all compilers inline vararg functions.
 // ----------------------------------------------------------------------------
 

-// log functions can't allocate memory (LogError("out of memory...") should
-// work!), so we use a static buffer for all log messages
-#define LOG_BUFFER_SIZE   (4096)
+// generic log function
+void wxVLogGeneric(wxLogLevel level, const wxChar *szFormat, va_list argptr)
+{
+    if ( IsLoggingEnabled() ) {
+        wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);

 
 

-// static buffer for error messages (FIXME MT-unsafe)
-static wxChar s_szBuf[LOG_BUFFER_SIZE];
+        wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+
+        wxLog::OnLog(level, s_szBuf, time(NULL));
+    }
+}

 
 

-// generic log function

 void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 {
 void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 {

-  if ( wxLog::GetActiveTarget() != NULL ) {

     va_list argptr;
     va_start(argptr, szFormat);
     va_list argptr;
     va_start(argptr, szFormat);

-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVLogGeneric(level, szFormat, argptr);

     va_end(argptr);
     va_end(argptr);

-
-    wxLog::OnLog(level, s_szBuf, time(NULL));
-  }

 }
 
 }
 

-#define IMPLEMENT_LOG_FUNCTION(level)                             \
-  void wxLog##level(const wxChar *szFormat, ...)                  \
-  {                                                               \
-    if ( wxLog::GetActiveTarget() != NULL ) {                     \
-      va_list argptr;                                             \
-      va_start(argptr, szFormat);                                 \
-      wxVsprintf(s_szBuf, szFormat, argptr);                      \
-      va_end(argptr);                                             \
-                                                                  \
-      wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));           \
-    }                                                             \
+#define IMPLEMENT_LOG_FUNCTION(level)                               \
+  void wxVLog##level(const wxChar *szFormat, va_list argptr)        \
+  {                                                                 \
+    if ( IsLoggingEnabled() ) {                                     \
+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
+                                                                    \
+      wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);    \
+                                                                    \
+      wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));             \
+    }                                                               \
+  }                                                                 \
+  void wxLog##level(const wxChar *szFormat, ...)                    \
+  {                                                                 \
+    va_list argptr;                                                 \
+    va_start(argptr, szFormat);                                     \
+    wxVLog##level(szFormat, argptr);                                \
+    va_end(argptr);                                                 \

   }
 
   }
 

-IMPLEMENT_LOG_FUNCTION(FatalError)

 IMPLEMENT_LOG_FUNCTION(Error)
 IMPLEMENT_LOG_FUNCTION(Warning)
 IMPLEMENT_LOG_FUNCTION(Message)
 IMPLEMENT_LOG_FUNCTION(Info)
 IMPLEMENT_LOG_FUNCTION(Status)
 
 IMPLEMENT_LOG_FUNCTION(Error)
 IMPLEMENT_LOG_FUNCTION(Warning)
 IMPLEMENT_LOG_FUNCTION(Message)
 IMPLEMENT_LOG_FUNCTION(Info)
 IMPLEMENT_LOG_FUNCTION(Status)
 

-// accepts an additional argument which tells to which frame the output should
-// be directed
-void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
+// fatal errors can't be suppressed nor handled by the custom log target and
+// always terminate the program
+void wxVLogFatalError(const wxChar *szFormat, va_list argptr)
+{
+    wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+
+#if wxUSE_GUI
+    wxMessageBox(s_szBuf, _("Fatal Error"), wxID_OK | wxICON_STOP);
+#else
+    fprintf(stderr, _("Fatal error: %s\n"), s_szBuf);
+#endif
+
+    abort();
+}
+
+void wxLogFatalError(const wxChar *szFormat, ...)

 {
 {

-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL ) {

     va_list argptr;
     va_start(argptr, szFormat);
     va_list argptr;
     va_start(argptr, szFormat);

-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVLogFatalError(szFormat, argptr);

     va_end(argptr);
     va_end(argptr);

-
-    wxASSERT( gs_pFrame == NULL ); // should be reset!
-    gs_pFrame = pFrame;
-    wxLog::OnLog(wxLOG_Status, s_szBuf, time(NULL));
-    gs_pFrame = (wxFrame *) NULL;
-  }

 }
 
 // same as info, but only if 'verbose' mode is on
 }
 
 // same as info, but only if 'verbose' mode is on

+void wxVLogVerbose(const wxChar *szFormat, va_list argptr)
+{
+    if ( IsLoggingEnabled() ) {
+        wxLog *pLog = wxLog::GetActiveTarget();
+        if ( pLog != NULL && pLog->GetVerbose() ) {
+            wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+            wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+
+            wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
+        }
+    }
+}
+

 void wxLogVerbose(const wxChar *szFormat, ...)
 {
 void wxLogVerbose(const wxChar *szFormat, ...)
 {

-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL && pLog->GetVerbose() ) {

     va_list argptr;
     va_start(argptr, szFormat);
     va_list argptr;
     va_start(argptr, szFormat);

-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVLogVerbose(szFormat, argptr);

     va_end(argptr);
     va_end(argptr);

-
-    wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
-  }

 }
 
 // debug functions
 #ifdef __WXDEBUG__
 }
 
 // debug functions
 #ifdef __WXDEBUG__

-#define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                       \
-  void wxLog##level(const wxChar *szFormat, ...)                  \
-  {                                                               \
-    if ( wxLog::GetActiveTarget() != NULL ) {                     \
-      va_list argptr;                                             \
-      va_start(argptr, szFormat);                                 \
-      wxVsprintf(s_szBuf, szFormat, argptr);                      \
-      va_end(argptr);                                             \
-                                                                  \
-      wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));           \
-    }                                                             \
+#define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                         \
+  void wxVLog##level(const wxChar *szFormat, va_list argptr)        \
+  {                                                                 \
+    if ( IsLoggingEnabled() ) {                                     \
+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
+                                                                    \
+      wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);    \
+                                                                    \
+      wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));             \
+    }                                                               \
+  }                                                                 \
+  void wxLog##level(const wxChar *szFormat, ...)                    \
+  {                                                                 \
+    va_list argptr;                                                 \
+    va_start(argptr, szFormat);                                     \
+    wxVLog##level(szFormat, argptr);                                \
+    va_end(argptr);                                                 \

   }
 
   }
 

-  void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)
+  void wxVLogTrace(const wxChar *mask, const wxChar *szFormat, va_list argptr)

   {
   {

-    wxLog *pLog = wxLog::GetActiveTarget();
+    if ( IsLoggingEnabled() && wxLog::IsAllowedTraceMask(mask) ) {
+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+      wxChar *p = s_szBuf;
+      size_t len = s_szBufSize;
+      wxStrncpy(s_szBuf, _T("("), len);
+      len -= 1; // strlen("(")
+      p += 1;
+      wxStrncat(p, mask, len);
+      size_t lenMask = wxStrlen(mask);
+      len -= lenMask;
+      p += lenMask;
+
+      wxStrncat(p, _T(") "), len);
+      len -= 2;
+      p += 2;

 
 

-    if ( pLog != NULL && wxLog::IsAllowedTraceMask(mask) ) {
-      va_list argptr;
-      va_start(argptr, szFormat);
-      wxVsprintf(s_szBuf, szFormat, argptr);
-      va_end(argptr);
+      wxVsnprintf(p, len, szFormat, argptr);

 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
     }
   }
 
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
     }
   }
 

-  void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...)
+  void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)

   {
   {

-    wxLog *pLog = wxLog::GetActiveTarget();
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogTrace(mask, szFormat, argptr);
+    va_end(argptr);
+  }

 
 

+  void wxVLogTrace(wxTraceMask mask, const wxChar *szFormat, va_list argptr)
+  {

     // we check that all of mask bits are set in the current mask, so
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
     // if both bits are set.
     // we check that all of mask bits are set in the current mask, so
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
     // if both bits are set.

-    if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {
-      va_list argptr;
-      va_start(argptr, szFormat);
-      wxVsprintf(s_szBuf, szFormat, argptr);
-      va_end(argptr);
+    if ( IsLoggingEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+      wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);

 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
     }
   }
 
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
     }
   }
 

+  void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...)
+  {
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogTrace(mask, szFormat, argptr);
+    va_end(argptr);
+  }
+

 #else // release
   #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)
 #endif
 #else // release
   #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)
 #endif


@@ -225,30 +295,49 @@ IMPLEMENT_LOG_DEBUG_FUNCTION(Trace)
 void wxLogSysErrorHelper(long lErrCode)
 {
     wxChar szErrMsg[LOG_BUFFER_SIZE / 2];
 void wxLogSysErrorHelper(long lErrCode)
 {
     wxChar szErrMsg[LOG_BUFFER_SIZE / 2];

-    wxSprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
-    wxStrncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - wxStrlen(s_szBuf));
+    wxSnprintf(szErrMsg, WXSIZEOF(szErrMsg),
+               _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
+    wxStrncat(s_szBuf, szErrMsg, s_szBufSize - wxStrlen(s_szBuf));

 
     wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
 }
 
 
     wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
 }
 

+void WXDLLEXPORT wxVLogSysError(const wxChar *szFormat, va_list argptr)
+{
+    if ( IsLoggingEnabled() ) {
+        wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+        wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+
+        wxLogSysErrorHelper(wxSysErrorCode());
+    }
+}
+

 void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
 {
     va_list argptr;
     va_start(argptr, szFormat);
 void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
 {
     va_list argptr;
     va_start(argptr, szFormat);

-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVLogSysError(szFormat, argptr);

     va_end(argptr);
     va_end(argptr);

+}
+
+void WXDLLEXPORT wxVLogSysError(long lErrCode, const wxChar *szFormat, va_list argptr)
+{
+    if ( IsLoggingEnabled() ) {
+        wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);

 
 

-    wxLogSysErrorHelper(wxSysErrorCode());
+        wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+
+        wxLogSysErrorHelper(lErrCode);
+    }

 }
 
 void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
 {
     va_list argptr;
     va_start(argptr, szFormat);
 }
 
 void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
 {
     va_list argptr;
     va_start(argptr, szFormat);

-    wxVsprintf(s_szBuf, szFormat, argptr);
+    wxVLogSysError(lErrCode, szFormat, argptr);

     va_end(argptr);
     va_end(argptr);

-
-    wxLogSysErrorHelper(lErrCode);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -258,13 +347,24 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
 wxLog::wxLog()
 {
     m_bHasMessages = FALSE;
 wxLog::wxLog()
 {
     m_bHasMessages = FALSE;

+}

 
 

-    // enable verbose messages by default in the debug builds
-#ifdef __WXDEBUG__
-    m_bVerbose = TRUE;
-#else // release
-    m_bVerbose = FALSE;
-#endif // debug/release
+wxChar *wxLog::SetLogBuffer( wxChar *buf, size_t size)
+{
+    wxChar *oldbuf = s_szBuf;
+
+    if( buf == 0 )
+    {
+        s_szBuf = s_szBufStatic;
+        s_szBufSize = WXSIZEOF( s_szBufStatic );
+    }
+    else
+    {
+        s_szBuf = buf;
+        s_szBufSize = size;
+    }
+
+    return (oldbuf == s_szBufStatic ) ? 0 : oldbuf;

 }
 
 wxLog *wxLog::GetActiveTarget()
 }
 
 wxLog *wxLog::GetActiveTarget()


@@ -276,15 +376,11 @@ wxLog *wxLog::GetActiveTarget()
         if ( !s_bInGetActiveTarget ) {
             s_bInGetActiveTarget = TRUE;
 
         if ( !s_bInGetActiveTarget ) {
             s_bInGetActiveTarget = TRUE;
 

-#ifdef  wxUSE_NOGUI
-            ms_pLogger = new wxLogStderr;
-#else

             // ask the application to create a log target for us
             if ( wxTheApp != NULL )
                 ms_pLogger = wxTheApp->CreateLogTarget();
             else
                 ms_pLogger = new wxLogStderr;
             // ask the application to create a log target for us
             if ( wxTheApp != NULL )
                 ms_pLogger = wxTheApp->CreateLogTarget();
             else
                 ms_pLogger = new wxLogStderr;

-#endif

 
             s_bInGetActiveTarget = FALSE;
 
 
             s_bInGetActiveTarget = FALSE;
 


@@ -309,6 +405,16 @@ wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
     return pOldLogger;
 }
 
     return pOldLogger;
 }
 

+void wxLog::DontCreateOnDemand()
+{
+    ms_bAutoCreate = FALSE;
+
+    // this is usually called at the end of the program and we assume that it
+    // is *always* called at the end - so we free memory here to avoid false
+    // memory leak reports from wxWin  memory tracking code
+    ClearTraceMasks();
+}
+

 void wxLog::RemoveTraceMask(const wxString& str)
 {
     int index = ms_aTraceMasks.Index(str);
 void wxLog::RemoveTraceMask(const wxString& str)
 {
     int index = ms_aTraceMasks.Index(str);


@@ -316,6 +422,11 @@ void wxLog::RemoveTraceMask(const wxString& str)
         ms_aTraceMasks.Remove((size_t)index);
 }
 
         ms_aTraceMasks.Remove((size_t)index);
 }
 

+void wxLog::ClearTraceMasks()
+{
+    ms_aTraceMasks.Clear();
+}
+

 void wxLog::TimeStamp(wxString *str)
 {
     if ( ms_timestamp )
 void wxLog::TimeStamp(wxString *str)
 {
     if ( ms_timestamp )


@@ -323,10 +434,10 @@ void wxLog::TimeStamp(wxString *str)
         wxChar buf[256];
         time_t timeNow;
         (void)time(&timeNow);
         wxChar buf[256];
         time_t timeNow;
         (void)time(&timeNow);

-//        wxStrftime(buf, WXSIZEOF(buf), ms_timestamp, localtime(&timeNow));
+        wxStrftime(buf, WXSIZEOF(buf), ms_timestamp, localtime(&timeNow));

 
         str->Empty();
 
         str->Empty();

-        *str << buf << _T(": ");
+        *str << buf << wxT(": ");

     }
 }
 
     }
 }
 


@@ -351,31 +462,34 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
         case wxLOG_Info:
             if ( GetVerbose() )
         case wxLOG_Message:
         case wxLOG_Info:
             if ( GetVerbose() )
         case wxLOG_Message:

+        case wxLOG_Status:

         default:    // log unknown log levels too
                 DoLogString(szString, t);
         default:    // log unknown log levels too
                 DoLogString(szString, t);

-            // fall through
-
-        case wxLOG_Status:
-            // nothing to do

             break;
 
         case wxLOG_Trace:
         case wxLOG_Debug:
 #ifdef __WXDEBUG__
             break;
 
         case wxLOG_Trace:
         case wxLOG_Debug:
 #ifdef __WXDEBUG__

-            DoLogString(szString, t);
-#endif
+            {
+                wxString msg = level == wxLOG_Trace ? wxT("Trace: ")
+                                                    : wxT("Debug: ");
+                msg << szString;
+                DoLogString(msg, t);
+            }
+#endif // Debug

             break;
     }
 }
 
 void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t))
 {
             break;
     }
 }
 
 void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t))
 {

-    wxFAIL_MSG(_T("DoLogString must be overriden if it's called."));
+    wxFAIL_MSG(wxT("DoLogString must be overriden if it's called."));

 }
 
 void wxLog::Flush()
 {
 }
 
 void wxLog::Flush()
 {

-    // do nothing
+    // remember that we don't have any more messages to show
+    m_bHasMessages = FALSE;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -390,500 +504,323 @@ wxLogStderr::wxLogStderr(FILE *fp)
         m_fp = fp;
 }
 
         m_fp = fp;
 }
 

-void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
-{
-    wxString str;
-    TimeStamp(&str);
-    str << szString << _T('\n');
+#if defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ > 0x5300)

 
 

-    fputs(str.mb_str(), m_fp);
-    fflush(m_fp);
+#if !TARGET_API_MAC_CARBON
+// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...

 
 

-    // under Windows, programs usually don't have stderr at all, so make show the
-    // messages also under debugger
-#ifdef __WXMSW__
-    OutputDebugString(str + _T('\r'));
-#endif // MSW
-}
-
-// ----------------------------------------------------------------------------
-// wxLogStream implementation
-// ----------------------------------------------------------------------------
-
-#if wxUSE_STD_IOSTREAM
-wxLogStream::wxLogStream(ostream *ostr)
-{
-    if ( ostr == NULL )
-        m_ostr = &cerr;
-    else
-        m_ostr = ostr;
-}
+#ifndef __MetroNubUtils__
+#include "MetroNubUtils.h"
+#endif

 
 

-void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
-{
-    (*m_ostr) << wxConvCurrent->cWX2MB(szString) << endl << flush;
-}
-#endif // wxUSE_STD_IOSTREAM
+#ifdef __cplusplus
+    extern "C" {
+#endif

 
 

-#ifndef wxUSE_NOGUI
+#ifndef __GESTALT__
+#include <Gestalt.h>
+#endif

 
 

-// ----------------------------------------------------------------------------
-// wxLogTextCtrl implementation
-// ----------------------------------------------------------------------------
+#ifndef true
+#define true 1
+#endif

 
 

-wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
-{
-    m_pTextCtrl = pTextCtrl;
-}
+#ifndef false
+#define false 0
+#endif

 
 

-void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t t)
-{
-    wxString msg;
-    TimeStamp(&msg);
-    msg << szString << _T('\n');
+#if TARGET_API_MAC_CARBON

 
 

-    m_pTextCtrl->AppendText(msg);
-}
+    #include <CodeFragments.h>

 
 

-// ----------------------------------------------------------------------------
-// wxLogGui implementation (FIXME MT-unsafe)
-// ----------------------------------------------------------------------------
+    EXTERN_API_C( long )
+    CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);

 
 

-wxLogGui::wxLogGui()
-{
-    Clear();
-}
+    ProcPtr gCallUniversalProc_Proc = NULL;

 
 

-void wxLogGui::Clear()
-{
-    m_bErrors = m_bWarnings = FALSE;
-    m_aMessages.Empty();
-    m_aTimes.Empty();
-}
+#endif

 
 

-void wxLogGui::Flush()
-{
-    if ( !m_bHasMessages )
-        return;
+static MetroNubUserEntryBlock*    gMetroNubEntry = NULL;

 
 

-    // do it right now to block any new calls to Flush() while we're here
-    m_bHasMessages = FALSE;
+static long fRunOnce = false;

 
 

-    // concatenate all strings (but not too many to not overfill the msg box)
-    wxString str;
-    size_t nLines = 0,
-    nMsgCount = m_aMessages.Count();
+Boolean IsCompatibleVersion(short inVersion);

 
 

-    // start from the most recent message
-    for ( size_t n = nMsgCount; n > 0; n-- ) {
-        // for Windows strings longer than this value are wrapped (NT 4.0)
-        const size_t nMsgLineWidth = 156;
+/* ---------------------------------------------------------------------------
+        IsCompatibleVersion
+   --------------------------------------------------------------------------- */

 
 

-        nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
+Boolean IsCompatibleVersion(short inVersion)
+{
+    Boolean result = false;

 
 

-        if ( nLines > 25 )  // don't put too many lines in message box
-            break;
+    if (fRunOnce)
+    {
+        MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;

 
 

-        str << m_aMessages[n - 1] << _T("\n");
+        result = (inVersion <= block->apiHiVersion);

     }
 
     }
 

-    const wxChar *title;
-    long style;
+    return result;
+}

 
 

-    if ( m_bErrors ) {
-        title = _("Error");
-        style = wxICON_STOP;
-    }
-    else if ( m_bWarnings ) {
-        title = _("Warning");
-        style = wxICON_EXCLAMATION;
-    }
-    else {
-        title = _("Information");
-        style = wxICON_INFORMATION;
-    }
+/* ---------------------------------------------------------------------------
+        IsMetroNubInstalled
+   --------------------------------------------------------------------------- */

 
 

-    wxMessageBox(str, title, wxOK | style);
+Boolean IsMetroNubInstalled()
+{
+    if (!fRunOnce)
+    {
+        long result, value;

 
 

-    // no undisplayed messages whatsoever
-    Clear();
-}
+        fRunOnce = true;
+        gMetroNubEntry = NULL;

 
 

-// the default behaviour is to discard all informational messages if there
-// are any errors/warnings.
-void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
-{
-    switch ( level ) {
-        case wxLOG_Info:
-            if ( GetVerbose() )
-        case wxLOG_Message:
-                if ( !m_bErrors ) {
-                    m_aMessages.Add(szString);
-                    m_aTimes.Add((long)t);
-                    m_bHasMessages = TRUE;
-                }
-                break;
+        if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000)
+        {
+            /* look for MetroNub's Gestalt selector */
+            if (Gestalt(kMetroNubUserSignature, &result) == noErr)
+            {

 
 

-        case wxLOG_Status:
-#if wxUSE_STATUSBAR
+            #if TARGET_API_MAC_CARBON
+                if (gCallUniversalProc_Proc == NULL)

                 {
                 {

-                    // find the top window and set it's status text if it has any
-                    wxFrame *pFrame = gs_pFrame;
-                    if ( pFrame == NULL ) {
-                        wxWindow *pWin = wxTheApp->GetTopWindow();
-                        if ( pWin != NULL && pWin->IsKindOf(CLASSINFO(wxFrame)) ) {
-                            pFrame = (wxFrame *)pWin;
-                        }
+                    CFragConnectionID   connectionID;
+                    Ptr                 mainAddress;
+                    Str255              errorString;
+                    ProcPtr             symbolAddress;
+                    OSErr               err;
+                    CFragSymbolClass    symbolClass;
+
+                    symbolAddress = NULL;
+                    err = GetSharedLibrary("\pInterfaceLib", kPowerPCCFragArch, kFindCFrag,
+                                           &connectionID, &mainAddress, errorString);
+
+                    if (err != noErr)
+                    {
+                        gCallUniversalProc_Proc = NULL;
+                        goto end;

                     }
 
                     }
 

-                    if ( pFrame != NULL )
-                        pFrame->SetStatusText(szString);
-                }
-#endif // wxUSE_STATUSBAR
-                break;
+                    err = FindSymbol(connectionID, "\pCallUniversalProc",
+                                    (Ptr *) &gCallUniversalProc_Proc, &symbolClass);

 
 

-        case wxLOG_Trace:
-        case wxLOG_Debug:
-                #ifdef __WXDEBUG__
-                {
-                    #ifdef __WXMSW__
-                        // don't prepend debug/trace here: it goes to the
-                        // debug window anyhow, but do put a timestamp
-                        wxString str;
-                        TimeStamp(&str);
-                        str << szString << _T("\n\r");
-                        OutputDebugString(str);
-                    #else
-                        // send them to stderr
-                        wxFprintf(stderr, _T("%s: %s\n"),
-                                  level == wxLOG_Trace ? _T("Trace")
-                                                       : _T("Debug"),
-                                  szString);
-                        fflush(stderr);
-                    #endif
+                    if (err != noErr)
+                    {
+                        gCallUniversalProc_Proc = NULL;
+                        goto end;
+                    }

                 }
                 }

-                #endif // __WXDEBUG__
-
-                break;
+            #endif

 
 

-        case wxLOG_FatalError:
-                // show this one immediately
-                wxMessageBox(szString, _("Fatal error"), wxICON_HAND);
-                break;
-
-        case wxLOG_Error:
-                // discard earlier informational messages if this is the 1st
-                // error because they might not make sense any more
-                if ( !m_bErrors ) {
-                    m_aMessages.Empty();
-                    m_aTimes.Empty();
-                    m_bHasMessages = TRUE;
-                    m_bErrors = TRUE;
-                }
-                // fall through
+                {
+                    MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;

 
 

-        case wxLOG_Warning:
-                if ( !m_bErrors ) {
-                    // for the warning we don't discard the info messages
-                    m_bWarnings = TRUE;
+                    /* make sure the version of the API is compatible */
+                    if (block->apiLowVersion <= kMetroNubUserAPIVersion &&
+                        kMetroNubUserAPIVersion <= block->apiHiVersion)
+                        gMetroNubEntry = block;        /* success! */

                 }
 
                 }
 

-                m_aMessages.Add(szString);
-                m_aTimes.Add((long)t);
-                break;
+            }
+        }

     }
     }

-}

 
 

-// ----------------------------------------------------------------------------
-// wxLogWindow and wxLogFrame implementation
-// ----------------------------------------------------------------------------
-
-// log frame class
-// ---------------
-class wxLogFrame : public wxFrame
-{
-public:
-    // ctor & dtor
-    wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle);
-    virtual ~wxLogFrame();
-
-    // menu callbacks
-    void OnClose(wxCommandEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-#if wxUSE_FILE
-    void OnSave (wxCommandEvent& event);
-#endif // wxUSE_FILE
-    void OnClear(wxCommandEvent& event);
-
-    void OnIdle(wxIdleEvent&);
-
-    // accessors
-    wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
-
-private:
-    enum
-    {
-        Menu_Close = 100,
-        Menu_Save,
-        Menu_Clear
-    };
+end:

 
 

-    // instead of closing just hide the window to be able to Show() it later
-    void DoClose() { Show(FALSE); }
-
-    wxTextCtrl  *m_pTextCtrl;
-    wxLogWindow *m_log;
+#if TARGET_API_MAC_CARBON
+    return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL);
+#else
+    return (gMetroNubEntry != NULL);
+#endif
+}

 
 

-    DECLARE_EVENT_TABLE()
-};
+/* ---------------------------------------------------------------------------
+        IsMWDebuggerRunning                                            [v1 API]
+   --------------------------------------------------------------------------- */

 
 

-BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
-    // wxLogWindow menu events
-    EVT_MENU(Menu_Close, wxLogFrame::OnClose)
-#if wxUSE_FILE
-    EVT_MENU(Menu_Save,  wxLogFrame::OnSave)
-#endif // wxUSE_FILE
-    EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
+Boolean IsMWDebuggerRunning()
+{
+    if (IsMetroNubInstalled())
+        return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
+    else
+        return false;
+}

 
 

-    EVT_CLOSE(wxLogFrame::OnCloseWindow)
-END_EVENT_TABLE()
+/* ---------------------------------------------------------------------------
+        AmIBeingMWDebugged                                            [v1 API]
+   --------------------------------------------------------------------------- */

 
 

-wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle)
-          : wxFrame(pParent, -1, szTitle)
+Boolean AmIBeingMWDebugged()

 {
 {

-    m_log = log;
-
-    m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
-            wxDefaultSize,
-            wxTE_MULTILINE  |
-            wxHSCROLL       |
-            wxTE_READONLY);
-
-    // create menu
-    wxMenuBar *pMenuBar = new wxMenuBar;
-    wxMenu *pMenu = new wxMenu;
-#if wxUSE_FILE
-    pMenu->Append(Menu_Save,  _("&Save..."), _("Save log contents to file"));
-#endif // wxUSE_FILE
-    pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents"));
-    pMenu->AppendSeparator();
-    pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
-    pMenuBar->Append(pMenu, _("&Log"));
-    SetMenuBar(pMenuBar);
-
-#if wxUSE_STATUSBAR
-    // status bar for menu prompts
-    CreateStatusBar();
-#endif // wxUSE_STATUSBAR
-
-    m_log->OnFrameCreate(this);
+    if (IsMetroNubInstalled())
+        return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
+    else
+        return false;

 }
 
 }
 

-void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event))
+/* ---------------------------------------------------------------------------
+        UserSetWatchPoint                                            [v2 API]
+   --------------------------------------------------------------------------- */
+
+OSErr UserSetWatchPoint (Ptr address, long length, WatchPointIDT* watchPointID)

 {
 {

-    DoClose();
+    if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
+        return CallUserSetWatchPointProc(gMetroNubEntry->userSetWatchPoint,
+                                         address, length, watchPointID);
+    else
+        return errProcessIsNotClient;

 }
 
 }
 

-void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+/* ---------------------------------------------------------------------------
+        ClearWatchPoint                                                [v2 API]
+   --------------------------------------------------------------------------- */
+
+OSErr ClearWatchPoint (WatchPointIDT watchPointID)

 {
 {

-    DoClose();
+    if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
+        return CallClearWatchPointProc(gMetroNubEntry->clearWatchPoint, watchPointID);
+    else
+        return errProcessIsNotClient;

 }
 
 }
 

-#if wxUSE_FILE
-void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
-{
-    // get the file name
-    // -----------------
-    const wxChar *szFileName = wxSaveFileSelector(_T("log"), _T("txt"), _T("log.txt"));
-    if ( szFileName == NULL ) {
-        // cancelled
-        return;
+#ifdef __cplusplus

     }
     }

+#endif

 
 

-    // open file
-    // ---------
-    wxFile file;
-    bool bOk = FALSE;
-    if ( wxFile::Exists(szFileName) ) {
-        bool bAppend = FALSE;
-        wxString strMsg;
-        strMsg.Printf(_("Append log to file '%s' "
-                    "(choosing [No] will overwrite it)?"), szFileName);
-        switch ( wxMessageBox(strMsg, _("Question"), wxYES_NO | wxCANCEL) ) {
-            case wxYES:
-                bAppend = TRUE;
-                break;
-
-            case wxNO:
-                bAppend = FALSE;
-                break;
-
-            case wxCANCEL:
-                return;
-
-            default:
-                wxFAIL_MSG(_("invalid message box return value"));
-        }
+#endif // !TARGET_API_MAC_CARBON

 
 

-        if ( bAppend ) {
-            bOk = file.Open(szFileName, wxFile::write_append);
-        }
-        else {
-            bOk = file.Create(szFileName, TRUE /* overwrite */);
-        }
-    }
-    else {
-        bOk = file.Create(szFileName);
-    }
+#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ > 0x5300)

 
 

-    // retrieve text and save it
-    // -------------------------
-    int nLines = m_pTextCtrl->GetNumberOfLines();
-    for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {
-        bOk = file.Write(m_pTextCtrl->GetLineText(nLine) +
-                // we're not going to pull in the whole wxTextFile if all we need is this...
-#if wxUSE_TEXTFILE
-                wxTextFile::GetEOL()
-#else // !wxUSE_TEXTFILE
-                '\n'
-#endif // wxUSE_TEXTFILE
-                        );
-    }
+void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+{
+    wxString str;
+    TimeStamp(&str);
+    str << szString;
+
+    fputs(str.mb_str(), m_fp);
+    fputc(_T('\n'), m_fp);
+    fflush(m_fp);

 
 

-    if ( bOk )
-        bOk = file.Close();
+    // under Windows, programs usually don't have stderr at all, so show the
+    // messages also under debugger - unless it's a console program
+#if defined(__WXMSW__) && wxUSE_GUI && !defined(__WXMICROWIN__)
+    str += wxT("\r\n") ;
+    OutputDebugString(str.c_str());
+#endif // MSW
+#if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI
+    Str255 pstr ;
+    strcpy( (char*) pstr , str.c_str() ) ;
+    strcat( (char*) pstr , ";g" ) ;
+    c2pstr( (char*) pstr ) ;
+
+    Boolean running = false ;
+
+#if !TARGET_API_MAC_CARBON && (__MWERKS__ > 0x5300)

 
 

-    if ( !bOk ) {
-        wxLogError(_("Can't save log contents to file."));
+    if ( IsMWDebuggerRunning() && AmIBeingMWDebugged() )
+    {
+        running = true ;

     }
     }

-    else {
-        wxLogStatus(this, _("Log saved to the file '%s'."), szFileName);
+
+#endif
+
+    if (running)
+    {
+#ifdef __powerc
+        DebugStr(pstr);
+#else
+        SysBreakStr(pstr);
+#endif

     }
     }

+#endif // Mac

 }
 }

-#endif // wxUSE_FILE

 
 

-void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
-{
-    m_pTextCtrl->Clear();
-}
+// ----------------------------------------------------------------------------
+// wxLogStream implementation
+// ----------------------------------------------------------------------------

 
 

-wxLogFrame::~wxLogFrame()
+#if wxUSE_STD_IOSTREAM
+wxLogStream::wxLogStream(wxSTD ostream *ostr)

 {
 {

-    m_log->OnFrameDelete(this);
+    if ( ostr == NULL )
+        m_ostr = &wxSTD cerr;
+    else
+        m_ostr = ostr;

 }
 
 }
 

-// wxLogWindow
-// -----------
-wxLogWindow::wxLogWindow(wxFrame *pParent,
-                         const wxChar *szTitle,
-                         bool bShow,
-                         bool bDoPass)
+void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))

 {
 {

-    m_bPassMessages = bDoPass;
-
-    m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
-    m_pOldLog = wxLog::SetActiveTarget(this);
-
-    if ( bShow )
-        m_pLogFrame->Show(TRUE);
+    wxString str;
+    TimeStamp(&str);
+    (*m_ostr) << str << wxConvertWX2MB(szString) << wxSTD endl;

 }
 }

+#endif // wxUSE_STD_IOSTREAM

 
 

-void wxLogWindow::Show(bool bShow)
-{
-    m_pLogFrame->Show(bShow);
-}
+// ----------------------------------------------------------------------------
+// wxLogChain
+// ----------------------------------------------------------------------------

 
 

-void wxLogWindow::Flush()
+wxLogChain::wxLogChain(wxLog *logger)

 {
 {

-    if ( m_pOldLog != NULL )
-        m_pOldLog->Flush();
-
-    m_bHasMessages = FALSE;
+    m_logNew = logger;
+    m_logOld = wxLog::SetActiveTarget(this);

 }
 
 }
 

-void wxLogWindow::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+void wxLogChain::SetLog(wxLog *logger)

 {
 {

-    // first let the previous logger show it
-    if ( m_pOldLog != NULL && m_bPassMessages ) {
-        // FIXME why can't we access protected wxLog method from here (we derive
-        //       from wxLog)? gcc gives "DoLog is protected in this context", what
-        //       does this mean? Anyhow, the cast is harmless and let's us do what
-        //       we want.
-        ((wxLogWindow *)m_pOldLog)->DoLog(level, szString, t);
-    }
+    if ( m_logNew != this )
+        delete m_logNew;

 
 

-    if ( m_pLogFrame ) {
-        switch ( level ) {
-            case wxLOG_Status:
-                // by default, these messages are ignored by wxLog, so process
-                // them ourselves
-                if ( !wxIsEmpty(szString) )
-                {
-                    wxString str;
-                    str << _("Status: ") << szString;
-                    DoLogString(str, t);
-                }
-                break;
-
-                // don't put trace messages in the text window for 2 reasons:
-                // 1) there are too many of them
-                // 2) they may provoke other trace messages thus sending a program
-                //    into an infinite loop
-            case wxLOG_Trace:
-                break;
-
-            default:
-                // and this will format it nicely and call our DoLogString()
-                wxLog::DoLog(level, szString, t);
-        }
-    }
+    wxLog::SetActiveTarget(logger);

 
 

-    m_bHasMessages = TRUE;
+    m_logNew = logger;

 }
 
 }
 

-void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+void wxLogChain::Flush()

 {
 {

-    // put the text into our window
-    wxTextCtrl *pText = m_pLogFrame->TextCtrl();
-
-    // remove selection (WriteText is in fact ReplaceSelection)
-#ifdef __WXMSW__
-    long nLen = pText->GetLastPosition();
-    pText->SetSelection(nLen, nLen);
-#endif // Windows
-
-    wxString msg;
-    TimeStamp(&msg);
-    msg << szString << _T('\n');
+    if ( m_logOld )
+        m_logOld->Flush();

 
 

-    pText->AppendText(msg);
-
-    // TODO ensure that the line can be seen
+    // be careful to avoid inifinite recursion
+    if ( m_logNew && m_logNew != this )
+        m_logNew->Flush();

 }
 
 }
 

-wxFrame *wxLogWindow::GetFrame() const
+void wxLogChain::DoLog(wxLogLevel level, const wxChar *szString, time_t t)

 {
 {

-    return m_pLogFrame;
-}
+    // let the previous logger show it
+    if ( m_logOld && IsPassingMessages() )
+    {
+        // bogus cast just to access protected DoLog
+        ((wxLogChain *)m_logOld)->DoLog(level, szString, t);
+    }

 
 

-void wxLogWindow::OnFrameCreate(wxFrame * WXUNUSED(frame))
-{
+    if ( m_logNew && m_logNew != this )
+    {
+        // as above...
+        ((wxLogChain *)m_logNew)->DoLog(level, szString, t);
+    }

 }
 
 }
 

-void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
-{
-    m_pLogFrame = (wxLogFrame *)NULL;
-}
+// ----------------------------------------------------------------------------
+// wxLogPassThrough
+// ----------------------------------------------------------------------------

 
 

-wxLogWindow::~wxLogWindow()
-{
-    delete m_pOldLog;
+#ifdef __VISUALC__
+    // "'this' : used in base member initializer list" - so what?
+    #pragma warning(disable:4355)
+#endif // VC++

 
 

-    // may be NULL if log frame already auto destroyed itself
-    delete m_pLogFrame;
+wxLogPassThrough::wxLogPassThrough()
+                : wxLogChain(this)
+{

 }
 
 }
 

-#endif  //wxUSE_NOGUI
+#ifdef __VISUALC__
+    #pragma warning(default:4355)
+#endif // VC++

 
 // ============================================================================
 // Global functions/variables
 
 // ============================================================================
 // Global functions/variables


@@ -896,8 +833,15 @@ wxLogWindow::~wxLogWindow()
 wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;
 bool            wxLog::ms_doLog        = TRUE;
 bool            wxLog::ms_bAutoCreate  = TRUE;
 wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;
 bool            wxLog::ms_doLog        = TRUE;
 bool            wxLog::ms_bAutoCreate  = TRUE;

+bool            wxLog::ms_bVerbose     = FALSE;

 
 

-const wxChar   *wxLog::ms_timestamp    = _T("%X");  // time only, no date
+size_t          wxLog::ms_suspendCount = 0;
+
+#if wxUSE_GUI
+    const wxChar *wxLog::ms_timestamp  = wxT("%X");  // time only, no date
+#else
+    const wxChar *wxLog::ms_timestamp  = NULL;       // save space
+#endif

 
 wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 wxArrayString   wxLog::ms_aTraceMasks;
 
 wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 wxArrayString   wxLog::ms_aTraceMasks;


@@ -946,7 +890,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()
 {

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

 #ifdef  __WIN32__
     return ::GetLastError();
 #else   //WIN16
 #ifdef  __WIN32__
     return ::GetLastError();
 #else   //WIN16


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

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

 #ifdef  __WIN32__
     static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
 
 #ifdef  __WIN32__
     static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
 


@@ -977,17 +921,23 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
             0, NULL);
 
     // copy it to our buffer and free memory
             0, NULL);
 
     // copy it to our buffer and free memory

-    wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
-    s_szBuf[WXSIZEOF(s_szBuf) - 1] = _T('\0');
-    LocalFree(lpMsgBuf);
-
-    // returned string is capitalized and ended with '\r\n' - bad
-    s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
-    size_t len = wxStrlen(s_szBuf);
-    if ( len > 0 ) {
-        // truncate string
-        if ( s_szBuf[len - 2] == _T('\r') )
-            s_szBuf[len - 2] = _T('\0');
+    if( lpMsgBuf != 0 ) {
+        wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
+        s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
+
+        LocalFree(lpMsgBuf);
+
+        // returned string is capitalized and ended with '\r\n' - bad
+        s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
+        size_t len = wxStrlen(s_szBuf);
+        if ( len > 0 ) {
+            // truncate string
+            if ( s_szBuf[len - 2] == wxT('\r') )
+                s_szBuf[len - 2] = wxT('\0');
+        }
+    }
+    else {
+        s_szBuf[0] = wxT('\0');

     }
 
     return s_szBuf;
     }
 
     return s_szBuf;


@@ -1001,102 +951,11 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
     wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);
     return s_szBuf;
 #else
     wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);
     return s_szBuf;
 #else

-    return strerror(nErrCode);
+    return strerror((int)nErrCode);

 #endif
 #endif  // Win/Unix
 }
 
 #endif
 #endif  // Win/Unix
 }
 

-// ----------------------------------------------------------------------------
-// debug helper
-// ----------------------------------------------------------------------------
-
-#ifdef  __WXDEBUG__
-
-// break into the debugger
-void Trap()
-{
-#ifdef __WXMSW__
-    DebugBreak();
-#elif defined(__WXMAC__)
-#if __powerc
-    Debugger();
-#else
-    SysBreak();
-#endif
-#elif defined(__UNIX__)
-    raise(SIGTRAP);
-#else
-    // TODO
-#endif // Win/Unix
-}
-
-// this function is called when an assert fails
-void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
-{
-    // this variable can be set to true to suppress "assert failure" messages
-    static bool s_bNoAsserts = FALSE;
-    static bool s_bInAssert = FALSE;        // FIXME MT-unsafe
-
-    if ( s_bInAssert ) {
-        // He-e-e-e-elp!! we're trapped in endless loop
-        Trap();
-
-        s_bInAssert = FALSE;
-
-        return;
-    }
-
-    s_bInAssert = TRUE;
-
-    wxChar szBuf[LOG_BUFFER_SIZE];
-
-    // make life easier for people using VC++ IDE: clicking on the message
-    // will take us immediately to the place of the failed assert
-#ifdef __VISUALC__
-    wxSprintf(szBuf, _T("%s(%d): assert failed"), szFile, nLine);
-#else  // !VC++
-    // make the error message more clear for all the others
-    wxSprintf(szBuf, _T("Assert failed in file %s at line %d"), szFile, nLine);
-#endif // VC/!VC
-
-    if ( szMsg != NULL ) {
-        wxStrcat(szBuf, _T(": "));
-        wxStrcat(szBuf, szMsg);
-    }
-    else {
-        wxStrcat(szBuf, _T("."));
-    }
-
-    if ( !s_bNoAsserts ) {
-        // send it to the normal log destination
-        wxLogDebug(szBuf);
-
-#if wxUSE_NOGUI
-        Trap();
-#else
-        // this message is intentionally not translated - it is for
-        // developpers only
-        wxStrcat(szBuf, _T("\nDo you want to stop the program?"
-                "\nYou can also choose [Cancel] to suppress "
-                "further warnings."));
-
-        switch ( wxMessageBox(szBuf, _("Debug"),
-                    wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
-            case wxYES:
-                Trap();
-                break;
-
-            case wxCANCEL:
-                s_bNoAsserts = TRUE;
-                break;
-
-                //case wxNO: nothing to do
-        }
-#endif // USE_NOGUI
-    }
-
-    s_bInAssert = FALSE;
-}
-
-#endif  //WXDEBUG
+#endif //wxUSE_LOG

 
 

+// vi:sts=4:sw=4:et