resource stack structure that sets up correct resource, new entry points for shared...

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 05917b8bdd960dac3bbdecad098dd75b3d94b7af..9d9b21c6608c8a32d7a0951d6bb907beb59f6fb5 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,27 +30,39 @@
 
 // wxWindows
 #ifndef WX_PRECOMP
 
 // wxWindows
 #ifndef WX_PRECOMP

-  #include  <wx/string.h>
-  #include  <wx/app.h>
-  #include  <wx/generic/msgdlgg.h>
-#endif
-
-#include  <wx/intl.h>
-#include  <wx/log.h>
+    #include "wx/string.h"
+    #include "wx/intl.h"
+    #include "wx/app.h"
+
+    #if wxUSE_GUI
+        #include "wx/window.h"
+        #ifdef __WXMSW__
+            #include "wx/msw/private.h"
+        #endif
+    #endif
+#endif //WX_PRECOMP
+
+#include  "wx/file.h"
+#include  "wx/textfile.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>
 

-// C++ headers
-#include  <iostream.h>
+#if defined(__WXMSW__)
+  #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString
+#endif

 
 

-// _WINDOWS_ is defined when windows.h is included,
-// __WINDOWS__ is defined for MS Windows compilation
-#if       defined(__WINDOWS__) && !defined(_WINDOWS_)
-#include  <windows.h>
-#endif  //windows.h
+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif

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


@@ -58,7 +71,7 @@
 // define this to enable wrapping of log messages
 //#define LOG_PRETTY_WRAP
 
 // define this to enable wrapping of log messages
 //#define LOG_PRETTY_WRAP
 

-#ifdef LOG_PRETTY_WRAP
+#ifdef  LOG_PRETTY_WRAP

   static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz);
 #endif
 
   static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz);
 #endif
 


@@ -67,43 +80,73 @@
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// implementation of Log functions
-//
-// NB: unfortunately we need all these distinct functions, we can't make them
-//     macros and not all compilers inline vararg functions.
+// globals

 // ----------------------------------------------------------------------------
 
 // 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)
 
 // ----------------------------------------------------------------------------
 
 // 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 (@@@ MT-unsafe)
-static char s_szBuf[LOG_BUFFER_SIZE];
+// static buffer for error messages
+static wxChar s_szBuf[LOG_BUFFER_SIZE];
+
+#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
+//
+// NB: unfortunately we need all these distinct functions, we can't make them
+//     macros and not all compilers inline vararg functions.
+// ----------------------------------------------------------------------------

 
 // generic log function
 
 // generic log function

-void wxLogGeneric(wxLog::Level level, wxTString strFormat, ...)
-{
-  if ( wxLog::GetActiveTarget() != NULL ) {               
-    va_list argptr;                                             
-    va_start(argptr, strFormat);                                
-    vsprintf(s_szBuf, strFormat, argptr);                       
-    va_end(argptr);                                             
-                                                                
-    wxLog::OnLog(level, s_szBuf);                         
-  }                                                             
-}
-
-#define IMPLEMENT_LOG_FUNCTION(level)                             \
-  void wxLog##level(wxTString strFormat, ...)                     \
-  {                                                               \
-    if ( wxLog::GetActiveTarget() != NULL ) {                     \
-      va_list argptr;                                             \
-      va_start(argptr, strFormat);                                \
-      vsprintf(s_szBuf, strFormat, argptr);                       \
-      va_end(argptr);                                             \
-                                                                  \
-      wxLog::OnLog(wxLog::level, s_szBuf);                        \
-    }                                                             \
+void wxVLogGeneric(wxLogLevel level, const wxChar *szFormat, va_list argptr)
+{
+    if ( IsLoggingEnabled() ) {
+        wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+        wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+
+        wxLog::OnLog(level, s_szBuf, time(NULL));
+    }
+}
+
+void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogGeneric(level, szFormat, argptr);
+    va_end(argptr);
+}
+
+#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, WXSIZEOF(s_szBuf), 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(FatalError)


@@ -113,66 +156,162 @@ IMPLEMENT_LOG_FUNCTION(Message)
 IMPLEMENT_LOG_FUNCTION(Info)
 IMPLEMENT_LOG_FUNCTION(Status)
 
 IMPLEMENT_LOG_FUNCTION(Info)
 IMPLEMENT_LOG_FUNCTION(Status)
 

-// debug functions don't use wxTString
-#undef  IMPLEMENT_LOG_FUNCTION
-#define IMPLEMENT_LOG_FUNCTION(level)                             \
-  void wxLog##level(const char *szFormat, ...)                    \
-  {                                                               \
-    if ( wxLog::GetActiveTarget() != NULL ) {                     \
-      va_list argptr;                                             \
-      va_start(argptr, szFormat);                                 \
-      vsprintf(s_szBuf, szFormat, argptr);                        \
-      va_end(argptr);                                             \
-                                                                  \
-      wxLog::OnLog(wxLog::level, s_szBuf);                        \
-    }                                                             \
-  }
+// 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);

 
 

-IMPLEMENT_LOG_FUNCTION(Debug)
-IMPLEMENT_LOG_FUNCTION(Trace)
+            wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);

 
 

-void wxLogVerbose(wxTString strFormat, ...)
-{                                            
-  if ( wxLog::GetVerbose() && wxLog::GetActiveTarget() != NULL ) {
-    va_list argptr;                              
-    va_start(argptr, strFormat);                 
-    vsprintf(s_szBuf, strFormat, argptr);        
-    va_end(argptr);                              
-                                                 
-    wxLog::OnLog(wxLog::Info, s_szBuf);
-  }                                              
+            wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
+        }
+    }

 }
 }

-  
-void wxLogSysError(wxTString str, ...)
+
+void wxLogVerbose(const wxChar *szFormat, ...)

 {
 {

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

     va_list argptr;
     va_list argptr;

-    va_start(argptr, str);
-    vsprintf(s_szBuf, str, argptr);
+    va_start(argptr, szFormat);
+    wxVLogVerbose(szFormat, argptr);

     va_end(argptr);
     va_end(argptr);

+}

 
 

-    char szErrMsg[LOG_BUFFER_SIZE / 2];
-    sprintf(szErrMsg, _(" (error %ld: %s)"), wxSysErrorCode(), wxSysErrorMsg());
-    strncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - strlen(s_szBuf));
+// debug functions
+#ifdef __WXDEBUG__
+#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, WXSIZEOF(s_szBuf), 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);                                                 \
+  }

 
 

-    wxLog::OnLog(wxLog::Error, s_szBuf);
+  void wxVLogTrace(const wxChar *mask, const wxChar *szFormat, va_list argptr)
+  {
+    if ( IsLoggingEnabled() && wxLog::IsAllowedTraceMask(mask) ) {
+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+      wxChar *p = s_szBuf;
+      size_t len = WXSIZEOF(s_szBuf);
+      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;
+
+      wxVsnprintf(p, len, szFormat, argptr);
+      
+      wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
+    }

   }
   }

+
+  void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)
+  {
+    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.
+    if ( IsLoggingEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+
+      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
+
+IMPLEMENT_LOG_DEBUG_FUNCTION(Debug)
+IMPLEMENT_LOG_DEBUG_FUNCTION(Trace)
+
+// wxLogSysError: one uses the last error code, for other  you must give it
+// explicitly
+
+// common part of both wxLogSysError
+void wxLogSysErrorHelper(long lErrCode)
+{
+    wxChar szErrMsg[LOG_BUFFER_SIZE / 2];
+    wxSnprintf(szErrMsg, WXSIZEOF(szErrMsg),
+               _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
+    wxStrncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - wxStrlen(s_szBuf));
+
+    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, WXSIZEOF(s_szBuf), szFormat, argptr);
+
+        wxLogSysErrorHelper(wxSysErrorCode());
+    }

 }
 
 }
 

-void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...)
+void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)

 {
 {

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

     va_list argptr;
     va_list argptr;

-    va_start(argptr, strFormat);
-    vsprintf(s_szBuf, strFormat, argptr);
+    va_start(argptr, szFormat);
+    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);

 
 

-    char szErrMsg[LOG_BUFFER_SIZE / 2];
-    sprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
-    strncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - strlen(s_szBuf));
+        wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);

 
 

-    wxLog::OnLog(wxLog::Error, s_szBuf);
-  }
+        wxLogSysErrorHelper(lErrCode);
+    }
+}
+
+void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogSysError(lErrCode, szFormat, argptr);
+    va_end(argptr);

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


@@ -181,105 +320,132 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...)
 
 wxLog::wxLog()
 {
 
 wxLog::wxLog()
 {

-  m_bHasMessages = FALSE;
+    m_bHasMessages = FALSE;

 }
 
 }
 

-wxLog *wxLog::GetActiveTarget() 
-{ 
-  if ( !ms_bInitialized ) {
-    // prevent infinite recursion if someone calls wxLogXXX() from wxApp
-    ms_bInitialized = TRUE;
+wxLog *wxLog::GetActiveTarget()
+{
+    if ( ms_bAutoCreate && ms_pLogger == NULL ) {
+        // prevent infinite recursion if someone calls wxLogXXX() from
+        // wxApp::CreateLogTarget()
+        static bool s_bInGetActiveTarget = FALSE;
+        if ( !s_bInGetActiveTarget ) {
+            s_bInGetActiveTarget = TRUE;
+
+            // ask the application to create a log target for us
+            if ( wxTheApp != NULL )
+                ms_pLogger = wxTheApp->CreateLogTarget();
+            else
+                ms_pLogger = new wxLogStderr;
+
+            s_bInGetActiveTarget = FALSE;
+
+            // do nothing if it fails - what can we do?
+        }
+    }

 
 

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

 
 

-    // do nothing if it fails - what can we do?
-  }
+wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
+{
+    if ( ms_pLogger != NULL ) {
+        // flush the old messages before changing because otherwise they might
+        // get lost later if this target is not restored
+        ms_pLogger->Flush();
+    }
+
+    wxLog *pOldLogger = ms_pLogger;
+    ms_pLogger = pLogger;

 
 

-  return ms_pLogger; 
+    return pOldLogger;

 }
 
 }
 

-wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
-{ 
-  // flush the old messages before changing
-  if ( ms_pLogger != NULL )
-    ms_pLogger->Flush();
-
-  ms_bInitialized = TRUE;
-
-  wxLog *pOldLogger = ms_pLogger; 
-  ms_pLogger = pLogger; 
-  return pOldLogger; 
-}
-
-void wxLog::DoLog(Level level, const char *szString)
-{
-  char szBuf[128];
-  time_t timeNow;
-  struct tm *ptmNow;
-
-  time(&timeNow);
-  ptmNow = localtime(&timeNow);
-
-  strftime(szBuf, WXSIZEOF(szBuf), ms_szTimeFormat, ptmNow);
-  wxString str = szBuf;
-
-  switch ( level ) {
-    case FatalError:
-      DoLogString(str << _("Fatal error: ") << szString);
-      DoLogString(_("Program aborted."));
-      Flush();
-      abort();
-      break;
-
-    case Error:
-      DoLogString(str << _("Error: ") << szString);
-      break;
-
-    case Warning:
-      DoLogString(str << _("Warning: ") << szString);
-      break;
-
-    case Info:
-      if ( GetVerbose() )
-    case Message:
-        DoLogString(str + szString);
-      // fall through
-
-    case Status:
-      // nothing to do
-      break;
-
-    case Trace:
-    case Debug:
-      #ifdef __DEBUG__
-        #ifdef  __WIN32__
-          // in addition to normal logging, also send the string to debugger
-          // (don't prepend "Debug" here: it will go to debug window anyhow)
-          ::OutputDebugString(str + szString + "\n\r");
-        #endif  //Win32
-        DoLogString(str << (level == Trace ? _("Trace") : _("Debug"))
-                        << ": " << szString);
-      #endif
-            
-      break;
-
-    default:
-      wxFAIL_MSG("unknown log level in wxLog::DoLog");
-  }
+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);
+    if ( index != wxNOT_FOUND )
+        ms_aTraceMasks.Remove((size_t)index);

 }
 
 }
 

-void wxLog::DoLogString(const char *WXUNUSED(szString))
+void wxLog::ClearTraceMasks()

 {
 {

-  wxFAIL_MSG("DoLogString must be overrided if it's called.");
+    ms_aTraceMasks.Clear();
+}
+
+void wxLog::TimeStamp(wxString *str)
+{
+    if ( ms_timestamp )
+    {
+        wxChar buf[256];
+        time_t timeNow;
+        (void)time(&timeNow);
+        wxStrftime(buf, WXSIZEOF(buf), ms_timestamp, localtime(&timeNow));
+
+        str->Empty();
+        *str << buf << wxT(": ");
+    }
+}
+
+void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+{
+    switch ( level ) {
+        case wxLOG_FatalError:
+            DoLogString(wxString(_("Fatal error: ")) + szString, t);
+            DoLogString(_("Program aborted."), t);
+            Flush();
+            abort();
+            break;
+
+        case wxLOG_Error:
+            DoLogString(wxString(_("Error: ")) + szString, t);
+            break;
+
+        case wxLOG_Warning:
+            DoLogString(wxString(_("Warning: ")) + szString, t);
+            break;
+
+        case wxLOG_Info:
+            if ( GetVerbose() )
+        case wxLOG_Message:
+        case wxLOG_Status:
+        default:    // log unknown log levels too
+                DoLogString(szString, t);
+            break;
+
+        case wxLOG_Trace:
+        case wxLOG_Debug:
+#ifdef __WXDEBUG__
+            {
+                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))
+{
+    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;

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


@@ -288,164 +454,330 @@ void wxLog::Flush()
 
 wxLogStderr::wxLogStderr(FILE *fp)
 {
 
 wxLogStderr::wxLogStderr(FILE *fp)
 {

-  if ( fp == NULL )
-    m_fp = stderr;
-  else
-    m_fp = fp;
+    if ( fp == NULL )
+        m_fp = stderr;
+    else
+        m_fp = fp;

 }
 
 }
 

-void wxLogStderr::DoLogString(const char *szString)
+#if defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ > 0x5300)
+
+#if !TARGET_API_MAC_CARBON
+// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
+
+#ifndef __MetroNubUtils__
+#include "MetroNubUtils.h"
+#endif
+
+#ifdef __cplusplus
+       extern "C" {
+#endif
+
+#ifndef __GESTALT__
+#include <Gestalt.h>
+#endif
+
+#ifndef true
+#define true 1
+#endif
+
+#ifndef false
+#define false 0
+#endif
+
+#if TARGET_API_MAC_CARBON
+
+       #include <CodeFragments.h>
+
+       EXTERN_API_C( long )
+       CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+
+       ProcPtr gCallUniversalProc_Proc = NULL;
+       
+#endif
+
+static MetroNubUserEntryBlock* gMetroNubEntry = NULL;
+
+static long fRunOnce = false;
+
+Boolean IsCompatibleVersion(short inVersion);
+
+/* ---------------------------------------------------------------------------
+               IsCompatibleVersion
+   --------------------------------------------------------------------------- */
+
+Boolean IsCompatibleVersion(short inVersion)

 {
 {

-  fputs(szString, m_fp);
-  fputc('\n', m_fp);
-  fflush(m_fp);
+       Boolean result = false;
+       
+       if (fRunOnce)
+       {
+               MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
+               
+               result = (inVersion <= block->apiHiVersion);
+       }
+       
+       return result;  

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxLogStream implementation
-// ----------------------------------------------------------------------------
+/* ---------------------------------------------------------------------------
+               IsMetroNubInstalled
+   --------------------------------------------------------------------------- */

 
 

-wxLogStream::wxLogStream(ostream *ostr)
+Boolean IsMetroNubInstalled()

 {
 {

-  if ( ostr == NULL )
-    m_ostr = &cerr;
-  else
-    m_ostr = ostr;
+       if (!fRunOnce)
+       {
+               long result, value;
+               
+               fRunOnce = true;
+               gMetroNubEntry = NULL;
+               
+               if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000)
+               {
+                       /* look for MetroNub's Gestalt selector */
+                       if (Gestalt(kMetroNubUserSignature, &result) == noErr)
+                       {
+                       
+                       #if TARGET_API_MAC_CARBON
+                               if (gCallUniversalProc_Proc == NULL)
+                               {
+                                       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;
+                                       }
+
+                                       err = FindSymbol(connectionID, "\pCallUniversalProc",
+                                                                       (Ptr *) &gCallUniversalProc_Proc, &symbolClass);
+                                       
+                                       if (err != noErr)
+                                       {
+                                               gCallUniversalProc_Proc = NULL;
+                                               goto end;
+                                       }
+                               }
+                       #endif
+                       
+                               {
+                                       MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
+                                       
+                                       /* make sure the version of the API is compatible */
+                                       if (block->apiLowVersion <= kMetroNubUserAPIVersion &&
+                                               kMetroNubUserAPIVersion <= block->apiHiVersion)
+                                               gMetroNubEntry = block;         /* success! */
+                               }
+
+                       }
+               }
+       }
+
+end:
+
+#if TARGET_API_MAC_CARBON
+       return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL);
+#else
+       return (gMetroNubEntry != NULL);
+#endif

 }
 
 }
 

-void wxLogStream::DoLogString(const char *szString)
+/* ---------------------------------------------------------------------------
+               IsMWDebuggerRunning                                                                                     [v1 API]
+   --------------------------------------------------------------------------- */
+
+Boolean IsMWDebuggerRunning()

 {
 {

-  (*m_ostr) << szString << endl << flush;
+       if (IsMetroNubInstalled())
+               return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
+       else
+               return false;

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxLogTextCtrl implementation
-// ----------------------------------------------------------------------------
+/* ---------------------------------------------------------------------------
+               AmIBeingMWDebugged                                                                                      [v1 API]
+   --------------------------------------------------------------------------- */

 
 

-/*
-wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
-             : wxLogStream(new ostream(pTextCtrl))
+Boolean AmIBeingMWDebugged()

 {
 {

+       if (IsMetroNubInstalled())
+               return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
+       else
+               return false;

 }
 
 }
 

-wxLogTextCtrl::~wxLogTextCtrl()
+/* ---------------------------------------------------------------------------
+               UserSetWatchPoint                                                                                       [v2 API]
+   --------------------------------------------------------------------------- */
+
+OSErr UserSetWatchPoint (Ptr address, long length, WatchPointIDT* watchPointID)
+{
+       if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
+               return CallUserSetWatchPointProc(gMetroNubEntry->userSetWatchPoint,
+                                                                                       address, length, watchPointID);
+       else
+               return errProcessIsNotClient;
+}
+
+/* ---------------------------------------------------------------------------
+               ClearWatchPoint                                                                                         [v2 API]
+   --------------------------------------------------------------------------- */
+
+OSErr ClearWatchPoint (WatchPointIDT watchPointID)
+{
+       if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
+               return CallClearWatchPointProc(gMetroNubEntry->clearWatchPoint,
+                                                                                       watchPointID);
+       else
+               return errProcessIsNotClient;
+}
+
+#ifdef __cplusplus
+       }
+#endif
+
+#endif // !TARGET_API_MAC_CARBON
+
+#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ > 0x5300)
+
+void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))

 {
 {

-  delete m_ostr;
+    wxString str;
+    TimeStamp(&str);
+    str << szString;
+
+    fputs(str.mb_str(), m_fp);
+    fputc(_T('\n'), m_fp);
+    fflush(m_fp);
+
+    // 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 ( IsMWDebuggerRunning() && AmIBeingMWDebugged() )
+    {
+        running = true ;
+    }
+
+#endif
+
+    if (running)
+    {
+#ifdef __powerc
+        DebugStr(pstr);
+#else
+        SysBreakStr(pstr);
+#endif
+    }
+#endif // Mac

 }
 }

-*/

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

-// wxLogGui implementation
+// wxLogStream implementation

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

-#ifndef   WX_TEST_MINIMAL
+#if wxUSE_STD_IOSTREAM
+wxLogStream::wxLogStream(wxSTD ostream *ostr)
+{
+    if ( ostr == NULL )
+        m_ostr = &wxSTD cerr;
+    else
+        m_ostr = ostr;
+}

 
 

-wxLogGui::wxLogGui()
+void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))

 {
 {

-  m_bErrors = FALSE;
+    wxString str;
+    TimeStamp(&str);
+    (*m_ostr) << str << wxConvertWX2MB(szString) << wxSTD endl;

 }
 }

+#endif // wxUSE_STD_IOSTREAM
+
+// ----------------------------------------------------------------------------
+// wxLogChain
+// ----------------------------------------------------------------------------

 
 

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

 {
 {

-  if ( !m_bHasMessages )
-    return;
+    m_logNew = logger;
+    m_logOld = wxLog::SetActiveTarget(this);
+}

 
 

-  // @@@ ugly...
-  
-  // concatenate all strings (but not too many to not overfill the msg box)
-  wxString str;
-  uint nLines    = 0, 
-       nMsgCount = m_aMessages.Count();
+void wxLogChain::SetLog(wxLog *logger)
+{
+    if ( m_logNew != this )
+        delete m_logNew;

 
 

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

 
 

-    nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
+    m_logNew = logger;
+}

 
 

-    if ( nLines > 25 )  // don't put too many lines in message box
-      break;
+void wxLogChain::Flush()
+{
+    if ( m_logOld )
+        m_logOld->Flush();

 
 

-    str << m_aMessages[n - 1] << "\n";
-  }
+    // be careful to avoid inifinite recursion
+    if ( m_logNew && m_logNew != this )
+        m_logNew->Flush();
+}

 
 

-  if ( m_bErrors ) {
-    wxMessageBox(str, _("Error"), wxOK | wxICON_EXCLAMATION);
-  }
-  else {
-    wxMessageBox(str, _("Information"), wxOK | wxICON_INFORMATION);
-  }
+void wxLogChain::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+{
+    // let the previous logger show it
+    if ( m_logOld && IsPassingMessages() )
+    {
+        // bogus cast just to access protected DoLog
+        ((wxLogChain *)m_logOld)->DoLog(level, szString, t);
+    }

 
 

-  // no undisplayed messages whatsoever
-  m_bHasMessages =
-  m_bErrors      = FALSE;
-  m_aMessages.Empty();
+    if ( m_logNew && m_logNew != this )
+    {
+        // as above...
+        ((wxLogChain *)m_logNew)->DoLog(level, szString, t);
+    }

 }
 
 }
 

-// the default behaviour is to discard all informational messages if there
-// are any errors/warnings.
-void wxLogGui::DoLog(Level level, const char *szString)
+// ----------------------------------------------------------------------------
+// wxLogPassThrough
+// ----------------------------------------------------------------------------
+
+#ifdef __VISUALC__
+    // "'this' : used in base member initializer list" - so what?
+    #pragma warning(disable:4355)
+#endif // VC++
+
+wxLogPassThrough::wxLogPassThrough()
+                : wxLogChain(this)

 {
 {

-  switch ( level ) {
-    case Info:
-      if ( GetVerbose() )
-    case Message:
-        if ( !m_bErrors ) {
-          m_aMessages.Add(szString);
-          m_bHasMessages = TRUE;
-        }
-      break;
-
-    case Status:
-      {
-        // find the top window and set it's status text if it has any
-        wxWindow *pWin = wxTheApp->GetTopWindow();
-        if ( pWin != NULL && pWin->IsKindOf(CLASSINFO(wxFrame)) ) {
-          wxFrame *pFrame = (wxFrame *)pWin;
-          pFrame->SetStatusText(szString);
-        }
-      }
-      break;
-
-    case Trace:
-    case Debug:
-      #ifdef __DEBUG__
-        #ifdef  __WIN32__
-          OutputDebugString(szString);
-          OutputDebugString("\n\r");
-        #else   //!WIN32
-          // send them to stderr
-          printf(stderr, level == Trace ? "Trace: %s\n" 
-                                        : "Debug: %s\n", szString);
-          fflush(stderr);
-        #endif  // WIN32
-      #endif
-      break;
-
-    case FatalError:
-      // show this one immediately
-      wxMessageBox(szString, "Fatal error", wxICON_HAND);
-      break;
-
-    case Error:
-    case Warning:
-      // discard earlier informational messages if this is the 1st error
-      if ( !m_bErrors ) {
-        m_aMessages.Empty();
-        m_bHasMessages = TRUE;
-        m_bErrors = TRUE;
-      }
-
-      m_aMessages.Add(szString);
-      break;
-    
-    default:
-      wxFAIL_MSG("unknown log level in wxLogGui::DoLog");
-  }

 }
 
 }
 

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

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


@@ -454,10 +786,22 @@ void wxLogGui::DoLog(Level level, const char *szString)
 // ----------------------------------------------------------------------------
 // static variables
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static variables
 // ----------------------------------------------------------------------------

-wxLog      *wxLog::ms_pLogger      = NULL;
-bool        wxLog::ms_bInitialized = FALSE;
-bool        wxLog::ms_bVerbose     = FALSE;
-const char *wxLog::ms_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
+
+wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;
+bool            wxLog::ms_doLog        = TRUE;
+bool            wxLog::ms_bAutoCreate  = TRUE;
+bool            wxLog::ms_bVerbose     = FALSE;
+
+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;

 
 // ----------------------------------------------------------------------------
 // stdout error logging helper
 
 // ----------------------------------------------------------------------------
 // stdout error logging helper


@@ -466,34 +810,33 @@ const char *wxLog::ms_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
 // helper function: wraps the message and justifies it under given position
 // (looks more pretty on the terminal). Also adds newline at the end.
 //
 // helper function: wraps the message and justifies it under given position
 // (looks more pretty on the terminal). Also adds newline at the end.
 //

-// @@ this is now disabled until I find a portable way of determining the
-//    terminal window size
-
-#ifdef    LOG_PRETTY_WRAP
+// TODO this is now disabled until I find a portable way of determining the
+//      terminal window size (ok, I found it but does anybody really cares?)
+#ifdef LOG_PRETTY_WRAP

 static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
 {
 static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
 {

-  size_t nMax = 80; // @@@@
-  size_t nStart = strlen(pszPrefix);
-  fputs(pszPrefix, f);
-
-  size_t n;
-  while ( *psz != '\0' ) {
-    for ( n = nStart; (n < nMax) && (*psz != '\0'); n++ )
-      putc(*psz++, f);
-
-    // wrapped?
-    if ( *psz != '\0' ) {
-      /*putc('\n', f);*/
-      for ( n = 0; n < nStart; n++ )
-        putc(' ', f);
-
-      // as we wrapped, squeeze all white space
-      while ( isspace(*psz) )
-        psz++;
+    size_t nMax = 80; // FIXME
+    size_t nStart = strlen(pszPrefix);
+    fputs(pszPrefix, f);
+
+    size_t n;
+    while ( *psz != '\0' ) {
+        for ( n = nStart; (n < nMax) && (*psz != '\0'); n++ )
+            putc(*psz++, f);
+
+        // wrapped?
+        if ( *psz != '\0' ) {
+            /*putc('\n', f);*/
+            for ( n = 0; n < nStart; n++ )
+                putc(' ', f);
+
+            // as we wrapped, squeeze all white space
+            while ( isspace(*psz) )
+                psz++;
+        }

     }
     }

-  }

 
 

-  putc('\n', f);
+    putc('\n', f);

 }
 #endif  //LOG_PRETTY_WRAP
 
 }
 #endif  //LOG_PRETTY_WRAP
 


@@ -504,108 +847,70 @@ 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  __WINDOWS__
-    #ifdef  __WIN32__
-      return ::GetLastError();
-    #else   //WIN16
-      // @@@@ what to do on Windows 3.1?
-      return 0;
-    #endif  //WIN16/32
-  #else   //Unix
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
+#ifdef  __WIN32__
+    return ::GetLastError();
+#else   //WIN16
+    // TODO what to do on Windows 3.1?
+    return 0;
+#endif  //WIN16/32
+#else   //Unix

     return errno;
     return errno;

-  #endif  //Win/Unix
+#endif  //Win/Unix

 }
 
 // get error message from system
 }
 
 // get error message from system

-const char *wxSysErrorMsg(unsigned long nErrCode)
+const wxChar *wxSysErrorMsg(unsigned long nErrCode)

 {
 {

-  if ( nErrCode == 0 )
-    nErrCode = wxSysErrorCode();
+    if ( nErrCode == 0 )
+        nErrCode = wxSysErrorCode();

 
 

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

 #ifdef  __WIN32__
 #ifdef  __WIN32__

-  static char s_szBuf[LOG_BUFFER_SIZE / 2];
-
-  // get error message from system
-  LPVOID lpMsgBuf;
-  FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                NULL, nErrCode, 
-                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                (LPTSTR)&lpMsgBuf,
-                0, NULL);
-
-  // copy it to our buffer and free memory
-  strncpy(s_szBuf, (const char *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
-  s_szBuf[WXSIZEOF(s_szBuf) - 1] = '\0';
-  LocalFree(lpMsgBuf);
-
-  // returned string is capitalized and ended with '\r\n' - bad
-  s_szBuf[0] = (char)tolower(s_szBuf[0]);
-  size_t len = strlen(s_szBuf);
-  if ( len > 0 ) {
-    // truncate string
-    if ( s_szBuf[len - 2] == '\r' )
-      s_szBuf[len - 2] = '\0';
-  }
+    static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
+
+    // get error message from system
+    LPVOID lpMsgBuf;
+    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+            NULL, nErrCode,
+            MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+            (LPTSTR)&lpMsgBuf,
+            0, NULL);
+
+    // copy it to our buffer and free memory
+    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;
-#else
-  // TODO: Windows 3.1
-  return NULL;
-#endif
+    return s_szBuf;
+#else   //Win16
+    // TODO
+    return NULL;
+#endif // Win16/32
+#else   // Unix
+#if wxUSE_UNICODE
+    static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
+    wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);
+    return s_szBuf;

 #else
 #else

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

 #endif
 #endif

+#endif  // Win/Unix

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// debug helper
-// ----------------------------------------------------------------------------
-
-#ifdef  __DEBUG__
-
-// this function is called when an assert fails
-void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
-{
-  // this variable can be set to true to suppress "assert failure" messages
-  static s_bNoAsserts = FALSE;
-
-  char szBuf[LOG_BUFFER_SIZE];
-  sprintf(szBuf, _("Assert failed in file %s at line %d"), szFile, nLine);
-  if ( szMsg != NULL ) {
-    strcat(szBuf, ": ");
-    strcat(szBuf, szMsg);
-  }
-  else {
-    strcat(szBuf, ".");
-  }
-
-  // send it to the normal log destination
-  wxLogDebug(szBuf);
-
-  #ifdef  __WINDOWS__
-    if ( !s_bNoAsserts ) {
-      strcat(szBuf, _("\nDo you want to stop the program?"
-                      "\nYou can also choose [Cancel] to suppress "
-                      "further warnings."));
-
-      switch ( ::MessageBox(NULL, szBuf, _("Debug"), 
-                            MB_YESNOCANCEL | MB_ICONINFORMATION) ) {
-        case IDYES:
-          DebugBreak();
-          break;
-
-        case IDCANCEL:
-          s_bNoAsserts = TRUE;
-          break;
-      }
-    }
-  #else   
-    // @@@@ don't know how to start the debugger under generic Unix
-    s_bNoAsserts = TRUE; // suppress 'unused var' warning
-    abort();
-  #endif
-}
-
-#endif  //DEBUG
-
+#endif //wxUSE_LOG