X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ef3052c912e6e1fb35d589d14d38d65b7eb70d9..6f34921d9369a31de14e4b07e4824e2d701710f0:/src/common/log.cpp?ds=inline diff --git a/src/common/log.cpp b/src/common/log.cpp index d523a74f5d..bf1994214f 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -32,6 +32,8 @@ #include #include #include + #include + #include #include #include @@ -40,6 +42,7 @@ #include #include +#include #include // other standard headers @@ -47,11 +50,11 @@ #include #include -// _WINDOWS_ is defined when windows.h is included, -// __WINDOWS__ is defined for MS Windows compilation -#if defined(__WINDOWS__) && !defined(_WINDOWS_) +#ifdef __WXMSW__ #include -#endif //windows.h +#else //Unix + #include +#endif //Win/Unix // ---------------------------------------------------------------------------- // non member functions @@ -64,6 +67,14 @@ 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 // ============================================================================ @@ -83,12 +94,12 @@ 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; - 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); @@ -96,12 +107,12 @@ void wxLogGeneric(wxLogLevel level, wxTString strFormat, ...) } #define IMPLEMENT_LOG_FUNCTION(level) \ - void wxLog##level(wxTString strFormat, ...) \ + void wxLog##level(const char *szFormat, ...) \ { \ 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); \ @@ -115,14 +126,32 @@ IMPLEMENT_LOG_FUNCTION(Message) IMPLEMENT_LOG_FUNCTION(Info) IMPLEMENT_LOG_FUNCTION(Status) +// accepts an additional argument which tells to which frame the output should +// be directed +void wxLogStatus(wxFrame *pFrame, const 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 -void wxLogVerbose(wxTString strFormat, ...) +void wxLogVerbose(const char *szFormat, ...) { 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); @@ -130,7 +159,7 @@ void wxLogVerbose(wxTString strFormat, ...) } // debug functions -#ifdef __DEBUG__ +#ifdef __WXDEBUG__ #define IMPLEMENT_LOG_DEBUG_FUNCTION(level) \ void wxLog##level(const char *szFormat, ...) \ { \ @@ -151,7 +180,7 @@ void wxLogVerbose(wxTString strFormat, ...) // we check that all of mask bits are set in the current mask, so // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something // if both bits are set. - if ( pLog != NULL && (pLog->GetTraceMask() & mask == mask) ) { + if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) { va_list argptr; va_start(argptr, szFormat); vsprintf(s_szBuf, szFormat, argptr); @@ -181,21 +210,21 @@ void wxLogSysErrorHelper(long lErrCode) wxLog::OnLog(wxLOG_Error, s_szBuf); } -void WXDLLEXPORT wxLogSysError(wxTString strFormat, ...) +void WXDLLEXPORT wxLogSysError(const char *szFormat, ...) { 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()); } -void WXDLLEXPORT wxLogSysError(long lErrCode, wxTString strFormat, ...) +void WXDLLEXPORT wxLogSysError(long lErrCode, const char *szFormat, ...) { 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); @@ -210,47 +239,47 @@ wxLog::wxLog() 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() - 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) -{ +{ // 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) +wxString wxLog::TimeStamp() const { wxString str; - // prepend a timestamp if not disabled if ( !IsEmpty(m_szTimeFormat) ) { char szBuf[128]; time_t timeNow; @@ -263,6 +292,14 @@ void wxLog::DoLog(wxLogLevel level, const char *szString) str = szBuf; } + return str; +} + +void wxLog::DoLog(wxLogLevel level, const char *szString) +{ + // prepend a timestamp if not disabled + wxString str = TimeStamp(); + switch ( level ) { case wxLOG_FatalError: DoLogString(str << _("Fatal error: ") << szString); @@ -291,26 +328,21 @@ void wxLog::DoLog(wxLogLevel level, const char *szString) case wxLOG_Trace: case wxLOG_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 == wxLOG_Trace ? "Trace" : "Debug") + #ifdef __WXDEBUG__ + DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug")) << ": " << szString); #endif - + break; default: - wxFAIL_MSG("unknown log level in wxLog::DoLog"); + wxFAIL_MSG(_("unknown log level in wxLog::DoLog")); } } -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.")); } void wxLog::Flush() @@ -359,17 +391,18 @@ void wxLogStream::DoLogString(const char *szString) // ---------------------------------------------------------------------------- wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl) // @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf -#ifndef __GTK__ + +// Also, in DLL mode in wxMSW, can't use it. +#if defined(NO_TEXT_WINDOW_STREAM) +#else : wxLogStream(new ostream(pTextCtrl)) -#endif //GTK +#endif { } wxLogTextCtrl::~wxLogTextCtrl() { - #ifndef __GTK__ - delete m_ostr; - #endif //GTK + delete m_ostr; } // ---------------------------------------------------------------------------- @@ -388,17 +421,20 @@ void wxLogGui::Flush() if ( !m_bHasMessages ) return; - // @@@ ugly... + // 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; - uint nLines = 0, + size_t nLines = 0, nMsgCount = m_aMessages.Count(); // start from the most recent message - for ( uint n = nMsgCount; n > 0; n-- ) { + for ( size_t n = nMsgCount; n > 0; n-- ) { // for Windows strings longer than this value are wrapped (NT 4.0) - const uint nMsgLineWidth = 156; + const size_t nMsgLineWidth = 156; nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth; @@ -416,7 +452,6 @@ void wxLogGui::Flush() } // no undisplayed messages whatsoever - m_bHasMessages = m_bErrors = FALSE; m_aMessages.Empty(); } @@ -438,32 +473,44 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString) case wxLOG_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); + 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 __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 + #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); + wxMessageBox(szString, _("Fatal error"), wxICON_HAND); break; case wxLOG_Error: @@ -477,28 +524,33 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString) m_aMessages.Add(szString); break; - + default: - wxFAIL_MSG("unknown log level in wxLogGui::DoLog"); + wxFAIL_MSG(_("unknown log level in wxLogGui::DoLog")); } } // ---------------------------------------------------------------------------- -// wxLogWindow implementation +// wxLogWindow and wxLogFrame implementation // ---------------------------------------------------------------------------- // log frame class +// --------------- class wxLogFrame : public wxFrame { public: - // ctor - wxLogFrame(const char *szTitle); + // ctor & dtor + wxLogFrame(wxFrame *pParent, wxLogWindow *log, const char *szTitle); + virtual ~wxLogFrame(); // menu callbacks void OnClose(wxCommandEvent& event); + void OnCloseWindow(wxCloseEvent& event); void OnSave (wxCommandEvent& event); void OnClear(wxCommandEvent& event); + void OnIdle(wxIdleEvent&); + // accessors wxTextCtrl *TextCtrl() const { return m_pTextCtrl; } @@ -510,7 +562,11 @@ private: Menu_Clear }; - wxTextCtrl *m_pTextCtrl; + // 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() }; @@ -521,45 +577,50 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame) EVT_MENU(Menu_Save, wxLogFrame::OnSave) EVT_MENU(Menu_Clear, wxLogFrame::OnClear) - EVT_CLOSE(wxLogFrame::OnClose) -END_EVENT_TABLE() + EVT_CLOSE(wxLogFrame::OnCloseWindow) +END_EVENT_TABLE() -wxLogFrame::wxLogFrame(const char *szTitle) - : wxFrame(NULL, -1, szTitle) +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 + // a rich edit control instead of a normal one we want in wxMSW m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, - wxSIMPLE_BORDER | + //wxSIMPLE_BORDER | wxTE_MULTILINE | wxHSCROLL | wxTE_READONLY); - /* - m_pTextCtrl->SetEditable(FALSE); - m_pTextCtrl->SetRichEdit(FALSE); - */ // create menu wxMenuBar *pMenuBar = new wxMenuBar; wxMenu *pMenu = new wxMenu; - pMenu->Append(Menu_Save, "&Save..."); - pMenu->Append(Menu_Clear, "C&lear"); + 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"); - pMenuBar->Append(pMenu, "&Log"); + pMenu->Append(Menu_Close, _("&Close"), _("Close this window")); + pMenuBar->Append(pMenu, _("&Log")); SetMenuBar(pMenuBar); - // @@ what about status bar? needed (for menu prompts)? + // status bar for menu prompts + CreateStatusBar(); + + m_log->OnFrameCreate(this); +} + +void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event)) +{ + DoClose(); } -void wxLogFrame::OnClose(wxCommandEvent& event) +void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { - // just hide the window - Show(FALSE); + DoClose(); } -void wxLogFrame::OnSave(wxCommandEvent& event) +void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event)) { // get the file name // ----------------- @@ -572,13 +633,13 @@ void wxLogFrame::OnSave(wxCommandEvent& event) // open file // --------- wxFile file; - Bool bOk; + bool bOk = FALSE; if ( wxFile::Exists(szFileName) ) { - Bool bAppend; + 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) ) { + switch ( wxMessageBox(strMsg, _("Question"), wxYES_NO | wxCANCEL) ) { case wxYES: bAppend = TRUE; break; @@ -591,7 +652,7 @@ void wxLogFrame::OnSave(wxCommandEvent& event) return; default: - wxFAIL_MSG("invalid message box return value"); + wxFAIL_MSG(_("invalid message box return value")); } if ( bAppend ) { @@ -607,53 +668,85 @@ void wxLogFrame::OnSave(wxCommandEvent& event) // retrieve text and save it // ------------------------- - +#ifdef __WXGTK__ // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet -#ifndef __GTK__ + wxLogError(_("Sorry, this function is not implemented under GTK")); +#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."); + wxLogError(_("Can't save log contents to file.")); return; } } -void wxLogFrame::OnClear(wxCommandEvent& event) +void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event)) { m_pTextCtrl->Clear(); } -wxLogWindow::wxLogWindow(const wxTString& strTitle) +wxLogFrame::~wxLogFrame() +{ + m_log->OnFrameDelete(this); +} + +// wxLogWindow +// ----------- +wxLogWindow::wxLogWindow(wxFrame *pParent, + const char *szTitle, + bool bShow, + bool bDoPass) { - m_pOldLog = wxLog::GetActiveTarget(); - m_pLogFrame = new wxLogFrame(strTitle); + 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) +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 ) { - // @@@ why can't we access protected wxLog method from here (we derive + 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); } - - // and this will format it nicely and call our DoLogString() - wxLog::DoLog(level, szString); + + // 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 + if ( m_pLogFrame && level != wxLOG_Trace ) { + // and this will format it nicely and call our DoLogString() + wxLog::DoLog(level, szString); + } + + m_bHasMessages = TRUE; } void wxLogWindow::DoLogString(const char *szString) @@ -662,8 +755,10 @@ void wxLogWindow::DoLogString(const char *szString) wxTextCtrl *pText = m_pLogFrame->TextCtrl(); // remove selection (WriteText is in fact ReplaceSelection) - long nLen = pText->GetLastPosition(); - pText->SetSelection(nLen, nLen); + #ifdef __WXMSW__ + long nLen = pText->GetLastPosition(); + pText->SetSelection(nLen, nLen); + #endif // Windows pText->WriteText(szString); pText->WriteText("\n"); // "\n" ok here (_not_ "\r\n") @@ -672,9 +767,24 @@ void wxLogWindow::DoLogString(const char *szString) // @@@ TODO } +wxFrame *wxLogWindow::GetFrame() const +{ + return m_pLogFrame; +} + +void wxLogWindow::OnFrameCreate(wxFrame *frame) +{ +} + +void wxLogWindow::OnFrameDelete(wxFrame *frame) +{ + m_pLogFrame = (wxLogFrame *) NULL; +} + wxLogWindow::~wxLogWindow() { - m_pLogFrame->Close(TRUE); + // may be NULL if log frame already auto destroyed itself + delete m_pLogFrame; } #endif //WX_TEST_MINIMAL @@ -686,8 +796,9 @@ wxLogWindow::~wxLogWindow() // ---------------------------------------------------------------------------- // static variables // ---------------------------------------------------------------------------- -wxLog *wxLog::ms_pLogger = NULL; -bool wxLog::ms_bInitialized = FALSE; +wxLog *wxLog::ms_pLogger = (wxLog *) NULL; +bool wxLog::ms_bAutoCreate = TRUE; +wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0; // ---------------------------------------------------------------------------- // stdout error logging helper @@ -733,7 +844,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz) // get error code from syste unsigned long wxSysErrorCode() { - #ifdef __WINDOWS__ + #ifdef __WXMSW__ #ifdef __WIN32__ return ::GetLastError(); #else //WIN16 @@ -751,14 +862,14 @@ const char *wxSysErrorMsg(unsigned long nErrCode) 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, - NULL, nErrCode, + NULL, nErrCode, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpMsgBuf, 0, NULL); @@ -769,7 +880,7 @@ const char *wxSysErrorMsg(unsigned long nErrCode) 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 @@ -791,13 +902,32 @@ const char *wxSysErrorMsg(unsigned long nErrCode) // debug helper // ---------------------------------------------------------------------------- -#ifdef __DEBUG__ +#ifdef __WXDEBUG__ + +void Trap() +{ + #ifdef __WXMSW__ + DebugBreak(); + #elif defined(__WXSTUBS__) + // TODO + #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 - 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); @@ -809,32 +939,30 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg) strcat(szBuf, "."); } - // send it to the normal log destination - wxLogDebug(szBuf); + if ( !s_bNoAsserts ) { + // 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.")); + 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; + switch ( wxMessageBox(szBuf, _("Debug"), + wxYES_NO | wxCANCEL | wxICON_STOP ) ) { + case wxYES: + Trap(); + break; - case IDCANCEL: - s_bNoAsserts = TRUE; - break; - } + case wxCANCEL: + s_bNoAsserts = TRUE; + break; + + //case wxNO: nothing to do } - #else // !Windows - // @@@@ don't know how to start the debugger under generic Unix - s_bNoAsserts = TRUE; // suppress 'unused var' warning - abort(); - #endif // Windows/!Windows + } + + s_bInAssert = FALSE; } -#endif //DEBUG +#endif //WXDEBUG