fixed bug in parsing filenames without paths, added more/better tests

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 66cc2c1d0cded282fcb0060d07684c18afcdbae9..7268dddc04d171ec9350c60196a496a9e5b1f34e 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,21 +30,27 @@
 
 // wxWindows
 #ifndef WX_PRECOMP
 
 // wxWindows
 #ifndef WX_PRECOMP

-  #include  <wx/app.h>
-  #include  <wx/string.h>
-  #include  <wx/intl.h>
-  #include  <wx/menu.h>
-  #include  <wx/frame.h>
-
-  #include  <wx/generic/msgdlgg.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"
+        #ifdef __WXMSW__
+            #include "wx/msw/private.h"
+        #endif
+        #include "wx/msgdlg.h"
+    #endif

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include  <wx/file.h>
-#include  <wx/textfile.h>
-#include  <wx/utils.h>
-#include  <wx/log.h>
+#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>
 
 // other standard headers
 #include  <errno.h>


@@ -51,7 +58,7 @@
 #include  <time.h>
 
 #ifdef  __WXMSW__
 #include  <time.h>
 
 #ifdef  __WXMSW__

-  #include  <windows.h>
+  #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString

 #else   //Unix
   #include  <signal.h>
 #endif  //Win/Unix
 #else   //Unix
   #include  <signal.h>
 #endif  //Win/Unix


@@ -67,55 +74,62 @@
   static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz);
 #endif
 
   static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz);
 #endif
 

-// ----------------------------------------------------------------------------
-// global variables
-// ----------------------------------------------------------------------------
-
-// we use a global variable to store the frame pointer for wxLogStatus - bad,
-// but it's he easiest way
-static wxFrame *gs_pFrame;
-

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ----------------------------------------------------------------------------

-// 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
+
+// ----------------------------------------------------------------------------
+// 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(wxLogLevel level, const char *szFormat, ...)
+void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)

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

+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+

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

-    vsprintf(s_szBuf, szFormat, argptr);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);

     va_end(argptr);
 
     va_end(argptr);
 

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

   }
 }
 
 #define IMPLEMENT_LOG_FUNCTION(level)                             \
   }
 }
 
 #define IMPLEMENT_LOG_FUNCTION(level)                             \

-  void wxLog##level(const char *szFormat, ...)                    \
+  void wxLog##level(const wxChar *szFormat, ...)                  \

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

+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                    \
+                                                                  \

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

-      vsprintf(s_szBuf, szFormat, argptr);                        \
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);  \

       va_end(argptr);                                             \
                                                                   \
       va_end(argptr);                                             \
                                                                   \

-      wxLog::OnLog(wxLOG_##level, s_szBuf);                       \
+      wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));           \

     }                                                             \
   }
 
     }                                                             \
   }
 


@@ -126,54 +140,70 @@ IMPLEMENT_LOG_FUNCTION(Message)
 IMPLEMENT_LOG_FUNCTION(Info)
 IMPLEMENT_LOG_FUNCTION(Status)
 
 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 char *szFormat, ...)
-{
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL ) {
-    va_list argptr;
-    va_start(argptr, szFormat);
-    vsprintf(s_szBuf, szFormat, argptr);
-    va_end(argptr);
-
-    wxASSERT( gs_pFrame == NULL ); // should be reset!
-    gs_pFrame = pFrame;
-    wxLog::OnLog(wxLOG_Status, s_szBuf);
-    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 wxLogVerbose(const char *szFormat, ...)
+void wxLogVerbose(const wxChar *szFormat, ...)

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

+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+

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

-    vsprintf(s_szBuf, szFormat, argptr);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);

     va_end(argptr);
 
     va_end(argptr);
 

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

   }
 }
 
 // debug functions
 #ifdef __WXDEBUG__
 #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                       \
   }
 }
 
 // debug functions
 #ifdef __WXDEBUG__
 #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                       \

-  void wxLog##level(const char *szFormat, ...)                    \
+  void wxLog##level(const wxChar *szFormat, ...)                  \

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

+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                    \
+                                                                  \

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

-      vsprintf(s_szBuf, szFormat, argptr);                        \
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);  \

       va_end(argptr);                                             \
                                                                   \
       va_end(argptr);                                             \
                                                                   \

-      wxLog::OnLog(wxLOG_##level, s_szBuf);                       \
+      wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));           \

     }                                                             \
   }
 
     }                                                             \
   }
 

-  void wxLogTrace(wxTraceMask mask, const char *szFormat, ...)
+  void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)
+  {
+    wxLog *pLog = wxLog::GetActiveTarget();
+
+    if ( pLog != NULL && 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;
+
+      va_list argptr;
+      va_start(argptr, szFormat);
+      wxVsnprintf(p, len, szFormat, argptr);
+      va_end(argptr);
+
+      wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
+    }
+  }
+
+  void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...)

   {
     wxLog *pLog = wxLog::GetActiveTarget();
 
   {
     wxLog *pLog = wxLog::GetActiveTarget();
 


@@ -181,12 +211,14 @@ void wxLogVerbose(const char *szFormat, ...)
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
     // if both bits are set.
     if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
     // if both bits are set.
     if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {

+      wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+

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

-      vsprintf(s_szBuf, szFormat, argptr);
+      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);

       va_end(argptr);
 
       va_end(argptr);
 

-      wxLog::OnLog(wxLOG_Trace, s_szBuf);
+      wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));

     }
   }
 
     }
   }
 


@@ -203,31 +235,36 @@ IMPLEMENT_LOG_DEBUG_FUNCTION(Trace)
 // common part of both wxLogSysError
 void wxLogSysErrorHelper(long lErrCode)
 {
 // common part of both wxLogSysError
 void wxLogSysErrorHelper(long lErrCode)
 {

-  char szErrMsg[LOG_BUFFER_SIZE / 2];
-  sprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
-  strncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - strlen(s_szBuf));
+    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);
+    wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));

 }
 
 }
 

-void WXDLLEXPORT wxLogSysError(const char *szFormat, ...)
+void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)

 {
 {

-  va_list argptr;
-  va_start(argptr, szFormat);
-  vsprintf(s_szBuf, szFormat, argptr);
-  va_end(argptr);
+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);

 
 

-  wxLogSysErrorHelper(wxSysErrorCode());
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+    va_end(argptr);
+
+    wxLogSysErrorHelper(wxSysErrorCode());

 }
 
 }
 

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

 {
 {

-  va_list argptr;
-  va_start(argptr, szFormat);
-  vsprintf(s_szBuf, szFormat, argptr);
-  va_end(argptr);
+    wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+    va_end(argptr);

 
 

-  wxLogSysErrorHelper(lErrCode);
+    wxLogSysErrorHelper(lErrCode);

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


@@ -236,119 +273,117 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, const char *szFormat, ...)
 
 wxLog::wxLog()
 {
 
 wxLog::wxLog()
 {

-  m_bHasMessages = FALSE;
-  m_bVerbose     = FALSE;
-  m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
+    m_bHasMessages = FALSE;
+    m_bVerbose = FALSE;

 }
 
 wxLog *wxLog::GetActiveTarget()
 {
 }
 
 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;
-
-      #ifdef  WX_TEST_MINIMAL
-        ms_pLogger = new wxLogStderr;
-      #else
-        // ask the application to create a log target for us
-        if ( wxTheApp != NULL )
-          ms_pLogger = wxTheApp->CreateLogTarget();
-      #endif
-
-      // do nothing if it fails - what can we do?
+    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?
+        }

     }
     }

-  }

 
 

-  return ms_pLogger;
+    return ms_pLogger;

 }
 
 }
 

-wxLog *wxLog::SetActiveTarget(wxLog *pLogger, bool bNoFlashOld)
+wxLog *wxLog::SetActiveTarget(wxLog *pLogger)

 {
 {

-  // flush the old messages before changing
-  if ( (ms_pLogger != NULL) && !bNoFlashOld ) {
-    ms_pLogger->Flush();
-  }
+    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 pOldLogger;
+    wxLog *pOldLogger = ms_pLogger;
+    ms_pLogger = pLogger;
+
+    return pOldLogger;

 }
 
 }
 

-wxString wxLog::TimeStamp() const
+void wxLog::RemoveTraceMask(const wxString& str)

 {
 {

-  wxString str;
-
-  if ( !IsEmpty(m_szTimeFormat) ) {
-    char szBuf[128];
-    time_t timeNow;
-    struct tm *ptmNow;
-
-    time(&timeNow);
-    ptmNow = localtime(&timeNow);
+    int index = ms_aTraceMasks.Index(str);
+    if ( index != wxNOT_FOUND )
+        ms_aTraceMasks.Remove((size_t)index);
+}

 
 

-    strftime(szBuf, WXSIZEOF(szBuf), m_szTimeFormat, ptmNow);
-    str = szBuf;
-  }
+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));

 
 

-  return str;
+        str->Empty();
+        *str << buf << wxT(": ");
+    }

 }
 
 }
 

-void wxLog::DoLog(wxLogLevel level, const char *szString)
+void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)

 {
 {

-  // prepend a timestamp if not disabled
-  wxString str = TimeStamp();
-
-  switch ( level ) {
-    case wxLOG_FatalError:
-      DoLogString(str << _("Fatal error: ") << szString);
-      DoLogString(_("Program aborted."));
-      Flush();
-      abort();
-      break;
-
-    case wxLOG_Error:
-      DoLogString(str << _("Error: ") << szString);
-      break;
-
-    case wxLOG_Warning:
-      DoLogString(str << _("Warning: ") << szString);
-      break;
-
-    case wxLOG_Info:
-      if ( GetVerbose() )
-    case wxLOG_Message:
-        DoLogString(str + szString);
-      // fall through
-
-    case wxLOG_Status:
-      // nothing to do
-      break;
-
-    case wxLOG_Trace:
-    case wxLOG_Debug:
-      #ifdef __WXDEBUG__
-        DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug"))
-                        << ": " << szString);
-      #endif
-
-      break;
-
-    default:
-      wxFAIL_MSG(_("unknown log level in wxLog::DoLog"));
-  }
+    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 char *WXUNUSED(szString))
+void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t))

 {
 {

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

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

-  // do nothing
+    // do nothing

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


@@ -357,465 +392,185 @@ 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;
+}
+
+#if defined(__WXMAC__) 
+#define kDebuggerSignature             'MWDB'
+
+static Boolean FindProcessBySignature(OSType signature, ProcessInfoRec* info)
+{      
+       OSErr err;
+       ProcessSerialNumber psn;
+       Boolean found = false;
+       psn.highLongOfPSN = 0;
+       psn.lowLongOfPSN = kNoProcess;
+       
+       if (!info) return false;
+       
+       info->processInfoLength = sizeof(ProcessInfoRec);
+       info->processName = NULL;
+       info->processAppSpec = NULL;
+       
+       err = noErr;
+       while (!found && err == noErr)
+       {
+               err = GetNextProcess(&psn);
+               if (err == noErr)
+               {
+                       err = GetProcessInformation(&psn, info);
+                       found = err == noErr && info->processSignature == signature;
+               }
+       }                               
+       return found;
+}
+
+pascal Boolean MWDebuggerIsRunning(void)
+{
+       ProcessInfoRec info;
+       return FindProcessBySignature(kDebuggerSignature, &info);
+}
+
+pascal OSErr AmIBeingMWDebugged(Boolean* result)
+{
+       OSErr err;
+       ProcessSerialNumber psn;
+       OSType sig = kDebuggerSignature;
+       AppleEvent      theAE = {typeNull, NULL};
+       AppleEvent      theReply = {typeNull, NULL};
+       AEAddressDesc addr  = {typeNull, NULL};
+       DescType actualType;
+       Size actualSize;
+       
+       if (!result) return paramErr;
+       
+       err = AECreateDesc(typeApplSignature, &sig, sizeof(sig), &addr);
+       if (err != noErr) goto exit;
+       
+       err = AECreateAppleEvent('MWDB', 'Dbg?', &addr,
+                               kAutoGenerateReturnID, kAnyTransactionID, &theAE);
+       if (err != noErr) goto exit;
+               
+       GetCurrentProcess(&psn);
+       err = AEPutParamPtr(&theAE, keyDirectObject, typeProcessSerialNumber,
+                       &psn, sizeof(psn));
+       if (err != noErr) goto exit;
+       
+       err = AESend(&theAE, &theReply, kAEWaitReply, kAENormalPriority,
+                                       kAEDefaultTimeout, NULL, NULL);
+       if (err != noErr) goto exit;
+       
+       err = AEGetParamPtr(&theReply, keyAEResult, typeBoolean, &actualType, result, 
+                               sizeof(Boolean), &actualSize);
+
+exit:
+       if (addr.dataHandle)
+               AEDisposeDesc(&addr);
+       if (theAE.dataHandle)
+               AEDisposeDesc(&theAE);
+       if (theReply.dataHandle)
+               AEDisposeDesc(&theReply);
+
+       return err;

 }
 }

+#endif

 
 

-void wxLogStderr::DoLogString(const char *szString)
-{
-  fputs(szString, m_fp);
-  fputc('\n', m_fp);
-  fflush(m_fp);
+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);
+
+    // 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
+    str += wxT("\r\n") ;
+    OutputDebugString(str.c_str());
+#endif // MSW
+#if defined(__WXMAC__) && wxUSE_GUI
+       Str255 pstr ;
+       strcpy( (char*) pstr , str.c_str() ) ;
+       strcat( (char*) pstr , ";g" ) ;
+       c2pstr( (char*) pstr ) ;
+#if __WXDEBUG__
+       Boolean running = false ;
+       
+/*
+       if ( MWDebuggerIsRunning() )
+       {
+               AmIBeingMWDebugged( &running ) ;
+       }
+*/
+       if (running)
+       {
+       #ifdef __powerc
+               DebugStr(pstr);
+       #else
+               SysBreakStr(pstr);
+       #endif
+       }
+       else            
+#endif
+       {
+       #ifdef __powerc
+               DebugStr(pstr);
+       #else
+               DebugStr(pstr);
+       #endif
+       }
+#endif // MSW

 }
 
 // ----------------------------------------------------------------------------
 // wxLogStream implementation
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // wxLogStream implementation
 // ----------------------------------------------------------------------------
 

+#if wxUSE_STD_IOSTREAM

 wxLogStream::wxLogStream(ostream *ostr)
 {
 wxLogStream::wxLogStream(ostream *ostr)
 {

-  if ( ostr == NULL )
-    m_ostr = &cerr;
-  else
-    m_ostr = ostr;
-}
-
-void wxLogStream::DoLogString(const char *szString)
-{
-  (*m_ostr) << szString << endl << flush;
-}
-
-// ----------------------------------------------------------------------------
-// wxLogTextCtrl implementation
-// ----------------------------------------------------------------------------
-wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
-// @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
-
-// Also, in DLL mode in wxMSW, can't use it.
-#if defined(NO_TEXT_WINDOW_STREAM)
-#else
-             : wxLogStream(new ostream(pTextCtrl))
-#endif
-{
-}
-
-wxLogTextCtrl::~wxLogTextCtrl()
-{
-  delete m_ostr;
-}
-
-// ----------------------------------------------------------------------------
-// wxLogGui implementation
-// ----------------------------------------------------------------------------
-
-#ifndef   WX_TEST_MINIMAL
-
-wxLogGui::wxLogGui()
-{
-  m_bErrors = FALSE;
+    if ( ostr == NULL )
+        m_ostr = &cerr;
+    else
+        m_ostr = ostr;

 }
 
 }
 

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

 {
 {

-  if ( !m_bHasMessages )
-    return;
-
-  // do it right now to block any new calls to Flush() while we're here
-  m_bHasMessages = FALSE;
-
-  // @@@ ugly...
-
-  // concatenate all strings (but not too many to not overfill the msg box)
-  wxString str;
-  size_t nLines    = 0,
-       nMsgCount = m_aMessages.Count();
-
-  // 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;
-
-    nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
-
-    if ( nLines > 25 )  // don't put too many lines in message box
-      break;
-
-    str << m_aMessages[n - 1] << "\n";
-  }
-
-  if ( m_bErrors ) {
-    wxMessageBox(str, _("Error"), wxOK | wxICON_EXCLAMATION);
-  }
-  else {
-    wxMessageBox(str, _("Information"), wxOK | wxICON_INFORMATION);
-  }
-
-  // no undisplayed messages whatsoever
-  m_bErrors      = FALSE;
-  m_aMessages.Empty();
+    wxString str;
+    TimeStamp(&str);
+    (*m_ostr) << str << wxConvertWX2MB(szString) << endl;

 }
 }

+#endif // wxUSE_STD_IOSTREAM

 
 

-// the default behaviour is to discard all informational messages if there
-// are any errors/warnings.
-void wxLogGui::DoLog(wxLogLevel level, const char *szString)
-{
-  switch ( level ) {
-    case wxLOG_Info:
-      if ( GetVerbose() )
-    case wxLOG_Message:
-        if ( !m_bErrors ) {
-          m_aMessages.Add(szString);
-          m_bHasMessages = TRUE;
-        }
-      break;
-
-    case wxLOG_Status:
-      {
-        // 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;
-          }
-        }
-
-        if ( pFrame != NULL )
-          pFrame->SetStatusText(szString);
-      }
-      break;
-
-    case wxLOG_Trace:
-    case wxLOG_Debug:
-      #ifdef __WXDEBUG__
-        {
-          wxString strTime = TimeStamp();
-
-          #if defined(__WIN32__) && !defined(__WXSTUBS__)
-              // don't prepend debug/trace here: it goes to the debug window
-              // anyhow, but do put a timestamp
-              OutputDebugString(strTime + szString + "\n\r");
-          #else   //!WIN32
-            // send them to stderr
-            fprintf(stderr, "%s %s: %s\n",
-                    strTime.c_str(),
-                    level == wxLOG_Trace ? _("Trace") : _("Debug"),
-                    szString);
-            fflush(stderr);
-          #endif  // WIN32
-        }
-      #endif
-      break;
-
-    case wxLOG_FatalError:
-      // show this one immediately
-      wxMessageBox(szString, _("Fatal error"), wxICON_HAND);
-      break;
-
-    case wxLOG_Error:
-    case wxLOG_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"));
-  }
-}
+// ============================================================================
+// Global functions/variables
+// ============================================================================

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

-// wxLogWindow and wxLogFrame implementation
+// static variables

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

-// log frame class
-// ---------------
-class wxLogFrame : public wxFrame
-{
-public:
-  // ctor & dtor
-  wxLogFrame(wxFrame *pParent, wxLogWindow *log, const char *szTitle);
-  virtual ~wxLogFrame();
+wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;
+bool            wxLog::ms_doLog        = TRUE;
+bool            wxLog::ms_bAutoCreate  = TRUE;

 
 

-  // menu callbacks
-  void OnClose(wxCommandEvent& event);
-  void OnCloseWindow(wxCloseEvent& event);
-  void OnSave (wxCommandEvent& event);
-  void OnClear(wxCommandEvent& event);
+size_t          wxLog::ms_suspendCount = 0;

 
 

-  void OnIdle(wxIdleEvent&);
-
-  // accessors
-  wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
-
-private:
-  enum
-  {
-    Menu_Close = 100,
-    Menu_Save,
-    Menu_Clear
-  };
-
-  // instead of closing just hide the window to be able to Show() it later
-  void DoClose() { Show(FALSE); }
-
-  wxTextCtrl  *m_pTextCtrl;
-  wxLogWindow *m_log;
-
-  DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
-  // wxLogWindow menu events
-  EVT_MENU(Menu_Close, wxLogFrame::OnClose)
-  EVT_MENU(Menu_Save,  wxLogFrame::OnSave)
-  EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
-
-  EVT_CLOSE(wxLogFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const char *szTitle)
-          : wxFrame(pParent, -1, szTitle)
-{
-  m_log = log;
-
-  // @@ kludge: wxSIMPLE_BORDER is simply to prevent wxWindows from creating
-  //    a rich edit control instead of a normal one we want in wxMSW
-  m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
-                               wxDefaultSize,
-                             //wxSIMPLE_BORDER |
-                               wxTE_MULTILINE  |
-                               wxHSCROLL       |
-                               wxTE_READONLY);
-
-  // create menu
-  wxMenuBar *pMenuBar = new wxMenuBar;
-  wxMenu *pMenu = new wxMenu;
-  pMenu->Append(Menu_Save,  _("&Save..."), _("Save log contents to 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);
-
-  // status bar for menu prompts
-  CreateStatusBar();
-
-  m_log->OnFrameCreate(this);
-}
-
-void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event))
-{
-  DoClose();
-}
-
-void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-  DoClose();
-}
-
-void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
-{
-  // get the file name
-  // -----------------
-  const char *szFileName = wxSaveFileSelector("log", "txt", "log.txt");
-  if ( szFileName == NULL ) {
-    // cancelled
-    return;
-  }
-
-  // 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"));
-    }
-
-    if ( bAppend ) {
-      bOk = file.Open(szFileName, wxFile::write_append);
-    }
-    else {
-      bOk = file.Create(szFileName, TRUE /* overwrite */);
-    }
-  }
-  else {
-    bOk = file.Create(szFileName);
-  }
-
-  // retrieve text and save it
-  // -------------------------
-#ifdef __WXGTK__
-  // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
-  wxLogError(_("Sorry, this function is not implemented under GTK"));
+#if wxUSE_GUI
+    const wxChar *wxLog::ms_timestamp  = wxT("%X");  // time only, no date

 #else
 #else

-  int nLines = m_pTextCtrl->GetNumberOfLines();
-  for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {
-    bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL());
-  }
-#endif //GTK
-
-  if ( bOk )
-    bOk = file.Close();
-
-  if ( !bOk ) {
-    wxLogError(_("Can't save log contents to file."));
-    return;
-  }
-}
-
-void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
-{
-  m_pTextCtrl->Clear();
-}
-
-wxLogFrame::~wxLogFrame()
-{
-  m_log->OnFrameDelete(this);
-}
-
-// wxLogWindow
-// -----------
-wxLogWindow::wxLogWindow(wxFrame *pParent,
-                         const char *szTitle,
-                         bool bShow,
-                         bool bDoPass)
-{
-  m_bPassMessages = bDoPass;
-
-  m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
-  m_pOldLog = wxLog::SetActiveTarget(this);
-
-  if ( bShow )
-    m_pLogFrame->Show(TRUE);
-}
-
-void wxLogWindow::Show(bool bShow)
-{
-  m_pLogFrame->Show(bShow);
-}
-
-void wxLogWindow::Flush()
-{
-  if ( m_pOldLog != NULL )
-    m_pOldLog->Flush();
-
-  m_bHasMessages = FALSE;
-}
-
-void wxLogWindow::DoLog(wxLogLevel level, const char *szString)
-{
-  // first let the previous logger show it
-  if ( m_pOldLog != NULL && m_bPassMessages ) {
-    // @@@ 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);
-  }
-
-  if ( m_pLogFrame ) {
-    switch ( level ) {
-      case wxLOG_Status:
-        // by default, these messages are ignored by wxLog, so process
-        // them ourselves
-        {
-          wxString str = TimeStamp();
-          str << _("Status: ") << szString;
-          DoLogString(str);
-        }
-        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);
-    }
-  }
-
-  m_bHasMessages = TRUE;
-}
-
-void wxLogWindow::DoLogString(const char *szString)
-{
-  // 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
-
-  pText->WriteText(szString);
-  pText->WriteText("\n"); // "\n" ok here (_not_ "\r\n")
-
-  // ensure that the line can be seen
-  // @@@ TODO
-}
-
-wxFrame *wxLogWindow::GetFrame() const
-{
-  return m_pLogFrame;
-}
-
-void wxLogWindow::OnFrameCreate(wxFrame *WXUNUSED(frame))
-{
-}
-
-void wxLogWindow::OnFrameDelete(wxFrame *WXUNUSED(frame))
-{
-  m_pLogFrame = (wxLogFrame *) NULL;
-}
-
-wxLogWindow::~wxLogWindow()
-{
-  // may be NULL if log frame already auto destroyed itself
-  delete m_pLogFrame;
-}
-
-#endif  //WX_TEST_MINIMAL
+    const wxChar *wxLog::ms_timestamp  = NULL;       // save space
+#endif

 
 

-// ============================================================================
-// Global functions/variables
-// ============================================================================
-
-// ----------------------------------------------------------------------------
-// static variables
-// ----------------------------------------------------------------------------
-wxLog      *wxLog::ms_pLogger      = (wxLog *) NULL;
-bool        wxLog::ms_bAutoCreate  = TRUE;
-wxTraceMask wxLog::ms_ulTraceMask  = (wxTraceMask)0;
+wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
+wxArrayString   wxLog::ms_aTraceMasks;

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


@@ -824,33 +579,33 @@ wxTraceMask wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 // 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 (ok, I found it but does anybody really cares?)
-#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
 


@@ -861,58 +616,64 @@ 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__
-    #ifdef  __WIN32__
-      return ::GetLastError();
-    #else   //WIN16
-      // @@@@ what to do on Windows 3.1?
-      return 0;
-    #endif  //WIN16/32
-  #else   //Unix
+#ifdef  __WXMSW__
+#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();
-
-  #ifdef  __WXMSW__
-    #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)wxToLower(s_szBuf[0]);
-      size_t len = strlen(s_szBuf);
-      if ( len > 0 ) {
+    if ( nErrCode == 0 )
+        nErrCode = wxSysErrorCode();
+
+#ifdef  __WXMSW__
+#ifdef  __WIN32__
+    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
+    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
         // truncate string

-        if ( s_szBuf[len - 2] == '\r' )
-          s_szBuf[len - 2] = '\0';
-      }
-
-      return s_szBuf;
-    #else   //Win16
-      // TODO @@@@
-      return NULL;
-    #endif // Win16/32
-  #else   // Unix
-    return strerror(nErrCode);
-  #endif  // Win/Unix
+        if ( s_szBuf[len - 2] == wxT('\r') )
+            s_szBuf[len - 2] = wxT('\0');
+    }
+
+    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
+    return strerror((int)nErrCode);
+#endif
+#endif  // Win/Unix

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


@@ -921,65 +682,110 @@ const char *wxSysErrorMsg(unsigned long nErrCode)
 
 #ifdef  __WXDEBUG__
 
 
 #ifdef  __WXDEBUG__
 

+// break into the debugger

 void Trap()
 {
 void Trap()
 {

-  #ifdef __WXMSW__
+#ifdef __WXMSW__

     DebugBreak();
     DebugBreak();

-  #elif defined(__WXSTUBS__)
-    // TODO
-  #else // Unix
+#elif defined(__WXMAC__)
+#if __powerc
+    Debugger();
+#else
+    SysBreak();
+#endif
+#elif defined(__UNIX__)

     raise(SIGTRAP);
     raise(SIGTRAP);

-  #endif // Win/Unix
+#else
+    // TODO
+#endif // Win/Unix

 }
 
 // this function is called when an assert fails
 }
 
 // this function is called when an assert fails

-void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
+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;
+    // 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();
-  }
+    if ( s_bInAssert ) {
+        // He-e-e-e-elp!! we're trapped in endless loop
+        Trap();

 
 

-  s_bInAssert = TRUE;
+        s_bInAssert = 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, ".");
-  }
+        return;
+    }

 
 

-  if ( !s_bNoAsserts ) {
-    // send it to the normal log destination
-    wxLogDebug(szBuf);
+    s_bInAssert = TRUE;

 
 

-    strcat(szBuf, _("\nDo you want to stop the program?"
-                    "\nYou can also choose [Cancel] to suppress "
-                    "further warnings."));
+    wxChar szBuf[LOG_BUFFER_SIZE];

 
 

-    switch ( wxMessageBox(szBuf, _("Debug"),
-                          wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
-      case wxYES:
-        Trap();
-        break;
+    // make life easier for people using VC++ IDE: clicking on the message
+    // will take us immediately to the place of the failed assert
+    wxSnprintf(szBuf, WXSIZEOF(szBuf),
+#ifdef __VISUALC__
+               wxT("%s(%d): assert failed"),
+#else  // !VC++
+    // make the error message more clear for all the others
+               wxT("Assert failed in file %s at line %d"),
+#endif // VC/!VC
+               szFile, nLine);

 
 

-      case wxCANCEL:
-        s_bNoAsserts = TRUE;
-        break;
+    if ( szMsg != NULL ) {
+        wxStrcat(szBuf, wxT(": "));
+        wxStrcat(szBuf, szMsg);
+    }
+    else {
+        wxStrcat(szBuf, wxT("."));
+    }

 
 

-      //case wxNO: nothing to do
+    if ( !s_bNoAsserts ) {
+        // send it to the normal log destination
+        wxLogDebug(szBuf);
+
+#if wxUSE_GUI || defined(__WXMSW__)
+        // this message is intentionally not translated - it is for
+        // developpers only
+        wxStrcat(szBuf, wxT("\nDo you want to stop the program?\nYou can also choose [Cancel] to suppress further warnings."));
+
+        // use the native message box if available: this is more robust than
+        // using our own
+#ifdef __WXMSW__
+        switch ( ::MessageBox(NULL, szBuf, _T("Debug"),
+                              MB_YESNOCANCEL | MB_ICONSTOP ) ) {
+            case IDYES:
+                Trap();
+                break;
+
+            case IDCANCEL:
+                s_bNoAsserts = TRUE;
+                break;
+
+            //case IDNO: nothing to do
+        }
+#else // !MSW
+        switch ( wxMessageBox(szBuf, wxT("Debug"),
+                              wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
+            case wxYES:
+                Trap();
+                break;
+
+            case wxCANCEL:
+                s_bNoAsserts = TRUE;
+                break;
+
+            //case wxNO: nothing to do
+        }
+#endif // GUI or MSW
+
+#else // !GUI
+        Trap();
+#endif // GUI/!GUI

     }
     }

-  }

 
 

-  s_bInAssert = FALSE;
+    s_bInAssert = FALSE;

 }
 
 #endif  //WXDEBUG
 
 }
 
 #endif  //WXDEBUG
 

+#endif //wxUSE_LOG