Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

in wxOnAssert() abort() replaced with raise(SIGTRAP) (Unix only)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@85 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1998-06-12 15:41:02 +00:00
parent 6a6d4eedf8
commit 3078c3a641
1 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/common/log.cpp
View File

@@ -47,11 +47,11 @@
#include <stdlib.h> #include <stdlib.h>
#include <time.h> #include <time.h>
// _WINDOWS_ is defined when windows.h is included, #ifdef __WINDOWS__
// __WINDOWS__ is defined for MS Windows compilation
#if defined(__WINDOWS__) && !defined(_WINDOWS_)
#include <windows.h> #include <windows.h>
#endif //windows.h #else //Unix
#include <signal.h>
#endif //Win/Unix
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// non member functions // non member functions
@@ -823,28 +823,28 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
// send it to the normal log destination // send it to the normal log destination
wxLogDebug(szBuf); wxLogDebug(szBuf);
#ifdef __WINDOWS__ if ( !s_bNoAsserts ) {
if ( !s_bNoAsserts ) { strcat(szBuf, _("\nDo you want to stop the program?"
strcat(szBuf, _("\nDo you want to stop the program?" "\nYou can also choose [Cancel] to suppress "
"\nYou can also choose [Cancel] to suppress " "further warnings."));
"further warnings."));
switch ( ::MessageBox(NULL, szBuf, _("Debug"), switch ( wxMessageBox(_("Debug"), szBuf,
MB_YESNOCANCEL | MB_ICONINFORMATION) ) { wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
case IDYES: case wxYES:
#ifdef __WINDOWS__
DebugBreak(); DebugBreak();
break; #else // Unix
raise(SIGTRAP);
#endif // Win/Unix
break;
case IDCANCEL: case wxCANCEL:
s_bNoAsserts = TRUE; s_bNoAsserts = TRUE;
break; 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
} }
#endif //DEBUG #endif //DEBUG