1. msec resolution for timer functions under Win32

2. small wxLog corrections/enhancements
3. some wxDateTime and wxLongLong work


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4744 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-11-28 23:30:18 +00:00
parent 2fc70a88e8
commit b76b015ed9
7 changed files with 852 additions and 111 deletions

View File

@@ -607,15 +607,16 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
// send it to the normal log destination
wxLogDebug(szBuf);
#if wxUSE_GUI
#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."));
"\nYou can also choose [Cancel] to suppress "
"further warnings."));
switch ( wxMessageBox(szBuf, _("Debug"),
wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
#if wxUSE_GUI
switch ( wxMessageBox(szBuf, "Debug",
wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
case wxYES:
Trap();
break;
@@ -624,8 +625,23 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
s_bNoAsserts = TRUE;
break;
//case wxNO: nothing to do
//case wxNO: nothing to do
}
#else // !GUI, but MSW
switch ( ::MessageBox(NULL, szBuf, "Debug",
MB_YESNOCANCEL | MB_ICONSTOP ) ) {
case IDYES:
Trap();
break;
case IDCANCEL:
s_bNoAsserts = TRUE;
break;
//case IDNO: nothing to do
}
#endif // GUI or MSW
#else // !GUI
Trap();
#endif // GUI/!GUI