several fixes

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index dd32729b419b90546f4528f30e6502f257191206..66b2caa787ff3bf10e40bd9fe0ea1c5c3bdd0f64 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -32,6 +32,7 @@
   #include  <wx/app.h>
   #include  <wx/string.h>
   #include  <wx/intl.h>
   #include  <wx/app.h>
   #include  <wx/string.h>
   #include  <wx/intl.h>

+  #include  <wx/menu.h>

 
   #include  <wx/generic/msgdlgg.h>
   #include  <wx/filedlg.h>
 
   #include  <wx/generic/msgdlgg.h>
   #include  <wx/filedlg.h>


@@ -40,6 +41,7 @@
 
 #include  <wx/file.h>
 #include  <wx/textfile.h>
 
 #include  <wx/file.h>
 #include  <wx/textfile.h>

+#include  <wx/utils.h>

 #include  <wx/log.h>
 
 // other standard headers
 #include  <wx/log.h>
 
 // other standard headers


@@ -47,7 +49,7 @@
 #include  <stdlib.h>
 #include  <time.h>
 
 #include  <stdlib.h>
 #include  <time.h>
 

-#ifdef  __WINDOWS__
+#ifdef  __WXMSW__

   #include  <windows.h>
 #else   //Unix
   #include  <signal.h>
   #include  <windows.h>
 #else   //Unix
   #include  <signal.h>


@@ -83,12 +85,12 @@
 static char s_szBuf[LOG_BUFFER_SIZE];
 
 // generic log function
 static char s_szBuf[LOG_BUFFER_SIZE];
 
 // generic log function

-void wxLogGeneric(wxLogLevel level, wxTString strFormat, ...)
+void wxLogGeneric(wxLogLevel level, const char *szFormat, ...)

 {
   if ( wxLog::GetActiveTarget() != NULL ) {
     va_list argptr;
 {
   if ( wxLog::GetActiveTarget() != NULL ) {
     va_list argptr;

-    va_start(argptr, strFormat);
-    vsprintf(s_szBuf, strFormat, argptr);
+    va_start(argptr, szFormat);
+    vsprintf(s_szBuf, szFormat, argptr);

     va_end(argptr);
 
     wxLog::OnLog(level, s_szBuf);
     va_end(argptr);
 
     wxLog::OnLog(level, s_szBuf);


@@ -96,12 +98,12 @@ void wxLogGeneric(wxLogLevel level, wxTString strFormat, ...)
 }
 
 #define IMPLEMENT_LOG_FUNCTION(level)                             \
 }
 
 #define IMPLEMENT_LOG_FUNCTION(level)                             \

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

   {                                                               \
     if ( wxLog::GetActiveTarget() != NULL ) {                     \
       va_list argptr;                                             \
   {                                                               \
     if ( wxLog::GetActiveTarget() != NULL ) {                     \
       va_list argptr;                                             \

-      va_start(argptr, strFormat);                                \
-      vsprintf(s_szBuf, strFormat, argptr);                       \
+      va_start(argptr, szFormat);                                 \
+      vsprintf(s_szBuf, szFormat, argptr);                        \

       va_end(argptr);                                             \
                                                                   \
       wxLog::OnLog(wxLOG_##level, s_szBuf);                       \
       va_end(argptr);                                             \
                                                                   \
       wxLog::OnLog(wxLOG_##level, s_szBuf);                       \


@@ -116,13 +118,13 @@ IMPLEMENT_LOG_FUNCTION(Info)
 IMPLEMENT_LOG_FUNCTION(Status)
 
 // same as info, but only if 'verbose' mode is on
 IMPLEMENT_LOG_FUNCTION(Status)
 
 // same as info, but only if 'verbose' mode is on

-void wxLogVerbose(wxTString strFormat, ...)
+void wxLogVerbose(const char *szFormat, ...)

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

-    va_start(argptr, strFormat);
-    vsprintf(s_szBuf, strFormat, argptr);
+    va_start(argptr, szFormat);
+    vsprintf(s_szBuf, szFormat, argptr);

     va_end(argptr);
 
     wxLog::OnLog(wxLOG_Info, s_szBuf);
     va_end(argptr);
 
     wxLog::OnLog(wxLOG_Info, s_szBuf);


@@ -130,7 +132,7 @@ void wxLogVerbose(wxTString strFormat, ...)
 }
 
 // debug functions
 }
 
 // debug functions

-#ifdef __DEBUG__
+#ifdef __WXDEBUG__

 #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                       \
   void wxLog##level(const char *szFormat, ...)                    \
   {                                                               \
 #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                       \
   void wxLog##level(const char *szFormat, ...)                    \
   {                                                               \


@@ -181,21 +183,21 @@ void wxLogSysErrorHelper(long lErrCode)
   wxLog::OnLog(wxLOG_Error, s_szBuf);
 }
 
   wxLog::OnLog(wxLOG_Error, s_szBuf);
 }
 

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

 {
   va_list argptr;
 {
   va_list argptr;

-  va_start(argptr, strFormat);
-  vsprintf(s_szBuf, strFormat, argptr);
+  va_start(argptr, szFormat);
+  vsprintf(s_szBuf, szFormat, argptr);

   va_end(argptr);
 
   wxLogSysErrorHelper(wxSysErrorCode());
 }
 
   va_end(argptr);
 
   wxLogSysErrorHelper(wxSysErrorCode());
 }
 

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

 {
   va_list argptr;
 {
   va_list argptr;

-  va_start(argptr, strFormat);
-  vsprintf(s_szBuf, strFormat, argptr);
+  va_start(argptr, szFormat);
+  vsprintf(s_szBuf, szFormat, argptr);

   va_end(argptr);
 
   wxLogSysErrorHelper(lErrCode);
   va_end(argptr);
 
   wxLogSysErrorHelper(lErrCode);


@@ -210,40 +212,41 @@ wxLog::wxLog()
   m_bHasMessages = FALSE;
   m_bVerbose     = FALSE;
   m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
   m_bHasMessages = FALSE;
   m_bVerbose     = FALSE;
   m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";

-  m_ulTraceMask  = (wxTraceMask)-1;        // set all bits

 }
 
 }
 

-wxLog *wxLog::GetActiveTarget() 
-{ 
-  if ( !ms_bInitialized ) {
+wxLog *wxLog::GetActiveTarget()
+{
+  if ( ms_bAutoCreate && ms_pLogger == NULL ) {

     // prevent infinite recursion if someone calls wxLogXXX() from
     // wxApp::CreateLogTarget()
     // prevent infinite recursion if someone calls wxLogXXX() from
     // wxApp::CreateLogTarget()

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

   }
 
   }
 

-  return ms_pLogger; 
+  return ms_pLogger;

 }
 
 wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
 }
 
 wxLog *wxLog::SetActiveTarget(wxLog *pLogger)

-{ 
+{

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

 }
 
 void wxLog::DoLog(wxLogLevel level, const char *szString)
 }
 
 void wxLog::DoLog(wxLogLevel level, const char *szString)


@@ -291,16 +294,16 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
 
     case wxLOG_Trace:
     case wxLOG_Debug:
 
     case wxLOG_Trace:
     case wxLOG_Debug:

-      #ifdef __DEBUG__
+      #ifdef __WXDEBUG__

         #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
         #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 == wxLOG_Trace ? "Trace" : "Debug")
+        DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug"))

                         << ": " << szString);
       #endif
                         << ": " << szString);
       #endif

-            
+

       break;
 
     default:
       break;
 
     default:


@@ -308,7 +311,7 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
   }
 }
 
   }
 }
 

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

 {
   wxFAIL_MSG("DoLogString must be overrided if it's called.");
 }
 {
   wxFAIL_MSG("DoLogString must be overrided if it's called.");
 }


@@ -359,17 +362,13 @@ void wxLogStream::DoLogString(const char *szString)
 // ----------------------------------------------------------------------------
 wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
 // @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
 // ----------------------------------------------------------------------------
 wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
 // @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf

-#ifndef __GTK__

              : wxLogStream(new ostream(pTextCtrl))
              : wxLogStream(new ostream(pTextCtrl))

-#endif //GTK

 {
 }
 
 wxLogTextCtrl::~wxLogTextCtrl()
 {
 {
 }
 
 wxLogTextCtrl::~wxLogTextCtrl()
 {

-  #ifndef __GTK__
-    delete m_ostr;
-  #endif //GTK
+  delete m_ostr;

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


@@ -389,10 +388,10 @@ void wxLogGui::Flush()
     return;
 
   // @@@ ugly...
     return;
 
   // @@@ ugly...

-  
+

   // concatenate all strings (but not too many to not overfill the msg box)
   wxString str;
   // concatenate all strings (but not too many to not overfill the msg box)
   wxString str;

-  uint nLines    = 0, 
+  uint nLines    = 0,

        nMsgCount = m_aMessages.Count();
 
   // start from the most recent message
        nMsgCount = m_aMessages.Count();
 
   // start from the most recent message


@@ -448,14 +447,14 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
 
     case wxLOG_Trace:
     case wxLOG_Debug:
 
     case wxLOG_Trace:
     case wxLOG_Debug:

-      #ifdef __DEBUG__
+      #ifdef __WXDEBUG__

         #ifdef  __WIN32__
           OutputDebugString(szString);
           OutputDebugString("\n\r");
         #else   //!WIN32
           // send them to stderr
         #ifdef  __WIN32__
           OutputDebugString(szString);
           OutputDebugString("\n\r");
         #else   //!WIN32
           // send them to stderr

-          fprintf(stderr, level == wxLOG_Trace ? "Trace: %s\n" 
-                                               : "Debug: %s\n", szString);
+          fprintf(stderr, "%s: %s\n",
+                  level == wxLOG_Trace ? _("Trace") : _("Debug"), szString);

           fflush(stderr);
         #endif  // WIN32
       #endif
           fflush(stderr);
         #endif  // WIN32
       #endif


@@ -463,7 +462,7 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
 
     case wxLOG_FatalError:
       // show this one immediately
 
     case wxLOG_FatalError:
       // show this one immediately

-      wxMessageBox(szString, "Fatal error", wxICON_HAND);
+      wxMessageBox(szString, _("Fatal error"), wxICON_HAND);

       break;
 
     case wxLOG_Error:
       break;
 
     case wxLOG_Error:


@@ -477,7 +476,7 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
 
       m_aMessages.Add(szString);
       break;
 
       m_aMessages.Add(szString);
       break;

-    
+

     default:
       wxFAIL_MSG("unknown log level in wxLogGui::DoLog");
   }
     default:
       wxFAIL_MSG("unknown log level in wxLogGui::DoLog");
   }


@@ -523,7 +522,7 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
   EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
 
   EVT_CLOSE(wxLogFrame::OnCloseWindow)
   EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
 
   EVT_CLOSE(wxLogFrame::OnCloseWindow)

-END_EVENT_TABLE() 
+END_EVENT_TABLE()

 
 wxLogFrame::wxLogFrame(const char *szTitle)
           : wxFrame(NULL, -1, szTitle)
 
 wxLogFrame::wxLogFrame(const char *szTitle)
           : wxFrame(NULL, -1, szTitle)


@@ -558,19 +557,19 @@ wxLogFrame::wxLogFrame(const char *szTitle)
   // @@ what about status bar? needed (for menu prompts)?
 }
 
   // @@ what about status bar? needed (for menu prompts)?
 }
 

-void wxLogFrame::OnClose(wxCommandEvent& event)
+void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event))

 {
   // just hide the window
   Show(FALSE);
 }
 
 {
   // just hide the window
   Show(FALSE);
 }
 

-void wxLogFrame::OnCloseWindow(wxCloseEvent& event)
+void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))

 {
   // just hide the window
   Show(FALSE);
 }
 
 {
   // just hide the window
   Show(FALSE);
 }
 

-void wxLogFrame::OnSave(wxCommandEvent& event)
+void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))

 {
   // get the file name
   // -----------------
 {
   // get the file name
   // -----------------


@@ -583,9 +582,9 @@ void wxLogFrame::OnSave(wxCommandEvent& event)
   // open file
   // ---------
   wxFile file;
   // open file
   // ---------
   wxFile file;

-  bool bOk;
+  bool bOk = FALSE; 

   if ( wxFile::Exists(szFileName) ) {
   if ( wxFile::Exists(szFileName) ) {

-    bool bAppend;
+    bool bAppend = FALSE;

     wxString strMsg;
     strMsg.Printf(_("Append log to file '%s' "
                     "(choosing [No] will overwrite it)?"), szFileName);
     wxString strMsg;
     strMsg.Printf(_("Append log to file '%s' "
                     "(choosing [No] will overwrite it)?"), szFileName);


@@ -618,8 +617,7 @@ void wxLogFrame::OnSave(wxCommandEvent& event)
 
   // retrieve text and save it
   // -------------------------
 
   // retrieve text and save it
   // -------------------------

-  
-#ifdef __GTK__
+#ifdef __WXGTK__

   // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
   wxLogError("Sorry, this function is not implemented under GTK");
 #else
   // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
   wxLogError("Sorry, this function is not implemented under GTK");
 #else


@@ -628,26 +626,26 @@ void wxLogFrame::OnSave(wxCommandEvent& event)
     bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL());
   }
 #endif //GTK
     bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL());
   }
 #endif //GTK

-  
+

   if ( bOk )
     bOk = file.Close();
 
   if ( !bOk ) {
   if ( bOk )
     bOk = file.Close();
 
   if ( !bOk ) {

-    wxLogError("Can't save log contents to file.");
+    wxLogError(_("Can't save log contents to file."));

     return;
   }
 }
 
     return;
   }
 }
 

-void wxLogFrame::OnClear(wxCommandEvent& event)
+void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))

 {
   m_pTextCtrl->Clear();
 }
 
 {
   m_pTextCtrl->Clear();
 }
 

-wxLogWindow::wxLogWindow(const wxTString& strTitle, bool bShow)
+wxLogWindow::wxLogWindow(const char *szTitle, bool bShow)

 {
   m_pOldLog = wxLog::GetActiveTarget();
 {
   m_pOldLog = wxLog::GetActiveTarget();

-  m_pLogFrame = new wxLogFrame(strTitle);
-  
+  m_pLogFrame = new wxLogFrame(szTitle);
+

   if ( bShow )
     m_pLogFrame->Show(TRUE);
 }
   if ( bShow )
     m_pLogFrame->Show(TRUE);
 }


@@ -657,17 +655,22 @@ void wxLogWindow::Show(bool bShow)
   m_pLogFrame->Show(bShow);
 }
 
   m_pLogFrame->Show(bShow);
 }
 

+wxFrame *wxLogWindow::GetFrame() const
+{
+  return m_pLogFrame;
+}
+

 void wxLogWindow::DoLog(wxLogLevel level, const char *szString)
 {
   // first let the previous logger show it
   if ( m_pOldLog != NULL ) {
 void wxLogWindow::DoLog(wxLogLevel level, const char *szString)
 {
   // first let the previous logger show it
   if ( m_pOldLog != NULL ) {

-    // @@@ why can't we access protected wxLog method from here (we derive 
+    // @@@ 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);
   }
     // 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);
   }

-  
+

   // and this will format it nicely and call our DoLogString()
   wxLog::DoLog(level, szString);
 }
   // and this will format it nicely and call our DoLogString()
   wxLog::DoLog(level, szString);
 }


@@ -678,7 +681,7 @@ void wxLogWindow::DoLogString(const char *szString)
   wxTextCtrl *pText = m_pLogFrame->TextCtrl();
 
   // remove selection (WriteText is in fact ReplaceSelection)
   wxTextCtrl *pText = m_pLogFrame->TextCtrl();
 
   // remove selection (WriteText is in fact ReplaceSelection)

-  #ifdef __WINDOWS__
+  #ifdef __WXMSW__

     long nLen = pText->GetLastPosition();
     pText->SetSelection(nLen, nLen);
   #endif // Windows
     long nLen = pText->GetLastPosition();
     pText->SetSelection(nLen, nLen);
   #endif // Windows


@@ -705,7 +708,8 @@ wxLogWindow::~wxLogWindow()
 // static variables
 // ----------------------------------------------------------------------------
 wxLog      *wxLog::ms_pLogger      = NULL;
 // static variables
 // ----------------------------------------------------------------------------
 wxLog      *wxLog::ms_pLogger      = NULL;

-bool        wxLog::ms_bInitialized = FALSE;
+bool        wxLog::ms_bAutoCreate  = TRUE;
+wxTraceMask wxLog::ms_ulTraceMask  = (wxTraceMask)0;

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


@@ -751,7 +755,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
 // get error code from syste
 unsigned long wxSysErrorCode()
 {
 // get error code from syste
 unsigned long wxSysErrorCode()
 {

-  #ifdef  __WINDOWS__
+  #ifdef  __WXMSW__

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


@@ -769,14 +773,14 @@ const char *wxSysErrorMsg(unsigned long nErrCode)
   if ( nErrCode == 0 )
     nErrCode = wxSysErrorCode();
 
   if ( nErrCode == 0 )
     nErrCode = wxSysErrorCode();
 

-  #ifdef  __WINDOWS__
+  #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,
     #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, 
+                    NULL, nErrCode,

                     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                     (LPTSTR)&lpMsgBuf,
                     0, NULL);
                     MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                     (LPTSTR)&lpMsgBuf,
                     0, NULL);


@@ -787,7 +791,7 @@ const char *wxSysErrorMsg(unsigned long nErrCode)
       LocalFree(lpMsgBuf);
 
       // returned string is capitalized and ended with '\r\n' - bad
       LocalFree(lpMsgBuf);
 
       // returned string is capitalized and ended with '\r\n' - bad

-      s_szBuf[0] = (char)tolower(s_szBuf[0]);
+      s_szBuf[0] = (char)wxToLower(s_szBuf[0]);

       size_t len = strlen(s_szBuf);
       if ( len > 0 ) {
         // truncate string
       size_t len = strlen(s_szBuf);
       if ( len > 0 ) {
         // truncate string


@@ -809,13 +813,30 @@ const char *wxSysErrorMsg(unsigned long nErrCode)
 // debug helper
 // ----------------------------------------------------------------------------
 
 // debug helper
 // ----------------------------------------------------------------------------
 

-#ifdef  __DEBUG__
+#ifdef  __WXDEBUG__
+
+void Trap()
+{
+  #ifdef __WXMSW__
+    DebugBreak();
+  #else // Unix
+    raise(SIGTRAP);
+  #endif // Win/Unix
+}

 
 // 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
 
 // 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;
+  static bool s_bNoAsserts = FALSE;
+  static bool s_bInAssert = FALSE;
+
+  if ( s_bInAssert ) {
+    // He-e-e-e-elp!! we're trapped in endless loop
+    Trap();
+  }
+
+  s_bInAssert = TRUE;

 
   char szBuf[LOG_BUFFER_SIZE];
   sprintf(szBuf, _("Assert failed in file %s at line %d"), szFile, nLine);
 
   char szBuf[LOG_BUFFER_SIZE];
   sprintf(szBuf, _("Assert failed in file %s at line %d"), szFile, nLine);


@@ -827,10 +848,10 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
     strcat(szBuf, ".");
   }
 
     strcat(szBuf, ".");
   }
 

-  // send it to the normal log destination
-  wxLogDebug(szBuf);
-

   if ( !s_bNoAsserts ) {
   if ( !s_bNoAsserts ) {

+    // send it to the normal log destination
+    wxLogDebug(szBuf);
+

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


@@ -838,21 +859,19 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
     switch ( wxMessageBox(szBuf, _("Debug"),
                           wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
       case wxYES:
     switch ( wxMessageBox(szBuf, _("Debug"),
                           wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
       case wxYES:

-        #ifdef __WINDOWS__
-          DebugBreak();
-        #else // Unix
-          raise(SIGTRAP);
-        #endif // Win/Unix
+        Trap();

         break;
 
       case wxCANCEL:
         s_bNoAsserts = TRUE;
         break;
         break;
 
       case wxCANCEL:
         s_bNoAsserts = TRUE;
         break;

-        
+

       //case wxNO: nothing to do
     }
   }
       //case wxNO: nothing to do
     }
   }

+
+  s_bInAssert = FALSE;

 }
 
 }
 

-#endif  //DEBUG
+#endif  //WXDEBUG