]> git.saurik.com Git - wxWidgets.git/blame - src/common/log.cpp
gcc warning about printf() format mismatch corrected
[wxWidgets.git] / src / common / log.cpp
CommitLineData
c801d85f
KB
1/////////////////////////////////////////////////////////////////////////////
2// Name: log.cpp
3// Purpose: Assorted wxLogXXX functions, and wxLog (sink for logs)
4// Author: Vadim Zeitlin
5// Modified by:
6// Created: 29/01/98
7// RCS-ID: $Id$
8// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
9// Licence: wxWindows license
10/////////////////////////////////////////////////////////////////////////////
11
12// ============================================================================
13// declarations
14// ============================================================================
15
16// ----------------------------------------------------------------------------
17// headers
18// ----------------------------------------------------------------------------
dd85fc6b 19
c801d85f
KB
20#ifdef __GNUG__
21 #pragma implementation "log.h"
22#endif
23
24// For compilers that support precompilation, includes "wx.h".
25#include "wx/wxprec.h"
26
27#ifdef __BORLANDC__
28 #pragma hdrstop
29#endif
30
31// wxWindows
32#ifndef WX_PRECOMP
e90c1d2a
VZ
33 #include "wx/string.h"
34 #include "wx/intl.h"
35 #include "wx/app.h"
36
37 #if wxUSE_GUI
38 #include "wx/window.h"
39 #ifdef __WXMSW__
40 #include "wx/msw/private.h"
41 #endif
42 #include "wx/msgdlg.h"
43 #endif
9ef3052c 44#endif //WX_PRECOMP
c801d85f 45
dbf3cd7a
RR
46#include "wx/file.h"
47#include "wx/textfile.h"
48#include "wx/utils.h"
a324a7bc 49#include "wx/wxchar.h"
dbf3cd7a 50#include "wx/log.h"
c801d85f
KB
51
52// other standard headers
53#include <errno.h>
54#include <stdlib.h>
55#include <time.h>
56
2049ba38 57#ifdef __WXMSW__
9ef3052c 58 #include <windows.h>
a0a302dc
JS
59 // Redefines OutputDebugString if necessary
60 #include "wx/msw/private.h"
3078c3a6
VZ
61#else //Unix
62 #include <signal.h>
63#endif //Win/Unix
c801d85f
KB
64
65// ----------------------------------------------------------------------------
66// non member functions
67// ----------------------------------------------------------------------------
68
69// define this to enable wrapping of log messages
70//#define LOG_PRETTY_WRAP
71
9ef3052c 72#ifdef LOG_PRETTY_WRAP
c801d85f
KB
73 static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz);
74#endif
75
76// ============================================================================
77// implementation
78// ============================================================================
79
80// ----------------------------------------------------------------------------
81// implementation of Log functions
82//
83// NB: unfortunately we need all these distinct functions, we can't make them
84// macros and not all compilers inline vararg functions.
85// ----------------------------------------------------------------------------
86
87// log functions can't allocate memory (LogError("out of memory...") should
88// work!), so we use a static buffer for all log messages
89#define LOG_BUFFER_SIZE (4096)
90
0fb67cd1 91// static buffer for error messages (FIXME MT-unsafe)
50920146 92static wxChar s_szBuf[LOG_BUFFER_SIZE];
c801d85f
KB
93
94// generic log function
50920146 95void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
c801d85f 96{
9ef3052c
VZ
97 if ( wxLog::GetActiveTarget() != NULL ) {
98 va_list argptr;
7502ba29 99 va_start(argptr, szFormat);
50920146 100 wxVsprintf(s_szBuf, szFormat, argptr);
9ef3052c
VZ
101 va_end(argptr);
102
0fb67cd1 103 wxLog::OnLog(level, s_szBuf, time(NULL));
9ef3052c 104 }
c801d85f
KB
105}
106
107#define IMPLEMENT_LOG_FUNCTION(level) \
50920146 108 void wxLog##level(const wxChar *szFormat, ...) \
c801d85f
KB
109 { \
110 if ( wxLog::GetActiveTarget() != NULL ) { \
111 va_list argptr; \
7502ba29 112 va_start(argptr, szFormat); \
50920146 113 wxVsprintf(s_szBuf, szFormat, argptr); \
c801d85f
KB
114 va_end(argptr); \
115 \
0fb67cd1 116 wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \
c801d85f
KB
117 } \
118 }
119
120IMPLEMENT_LOG_FUNCTION(FatalError)
121IMPLEMENT_LOG_FUNCTION(Error)
122IMPLEMENT_LOG_FUNCTION(Warning)
123IMPLEMENT_LOG_FUNCTION(Message)
124IMPLEMENT_LOG_FUNCTION(Info)
125IMPLEMENT_LOG_FUNCTION(Status)
126
9ef3052c 127// same as info, but only if 'verbose' mode is on
50920146 128void wxLogVerbose(const wxChar *szFormat, ...)
9ef3052c
VZ
129{
130 wxLog *pLog = wxLog::GetActiveTarget();
131 if ( pLog != NULL && pLog->GetVerbose() ) {
132 va_list argptr;
7502ba29 133 va_start(argptr, szFormat);
50920146 134 wxVsprintf(s_szBuf, szFormat, argptr);
9ef3052c
VZ
135 va_end(argptr);
136
0fb67cd1 137 wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
9ef3052c
VZ
138 }
139}
140
141// debug functions
b2aef89b 142#ifdef __WXDEBUG__
9ef3052c 143#define IMPLEMENT_LOG_DEBUG_FUNCTION(level) \
50920146 144 void wxLog##level(const wxChar *szFormat, ...) \
c801d85f
KB
145 { \
146 if ( wxLog::GetActiveTarget() != NULL ) { \
147 va_list argptr; \
148 va_start(argptr, szFormat); \
50920146 149 wxVsprintf(s_szBuf, szFormat, argptr); \
c801d85f
KB
150 va_end(argptr); \
151 \
0fb67cd1 152 wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \
c801d85f
KB
153 } \
154 }
155
50920146 156 void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)
0fb67cd1
VZ
157 {
158 wxLog *pLog = wxLog::GetActiveTarget();
159
160 if ( pLog != NULL && wxLog::IsAllowedTraceMask(mask) ) {
161 va_list argptr;
162 va_start(argptr, szFormat);
50920146 163 wxVsprintf(s_szBuf, szFormat, argptr);
0fb67cd1
VZ
164 va_end(argptr);
165
166 wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
167 }
168 }
169
50920146 170 void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...)
9ef3052c
VZ
171 {
172 wxLog *pLog = wxLog::GetActiveTarget();
c801d85f 173
9ef3052c
VZ
174 // we check that all of mask bits are set in the current mask, so
175 // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
176 // if both bits are set.
d93f63db 177 if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {
9ef3052c
VZ
178 va_list argptr;
179 va_start(argptr, szFormat);
50920146 180 wxVsprintf(s_szBuf, szFormat, argptr);
9ef3052c
VZ
181 va_end(argptr);
182
0fb67cd1 183 wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
9ef3052c
VZ
184 }
185 }
186
187#else // release
188 #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)
189#endif
190
191IMPLEMENT_LOG_DEBUG_FUNCTION(Debug)
192IMPLEMENT_LOG_DEBUG_FUNCTION(Trace)
193
194// wxLogSysError: one uses the last error code, for other you must give it
195// explicitly
196
197// common part of both wxLogSysError
198void wxLogSysErrorHelper(long lErrCode)
c801d85f 199{
50920146
OK
200 wxChar szErrMsg[LOG_BUFFER_SIZE / 2];
201 wxSprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
202 wxStrncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - wxStrlen(s_szBuf));
c801d85f 203
0fb67cd1 204 wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
9ef3052c 205}
c801d85f 206
50920146 207void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
9ef3052c 208{
0fb67cd1
VZ
209 va_list argptr;
210 va_start(argptr, szFormat);
50920146 211 wxVsprintf(s_szBuf, szFormat, argptr);
0fb67cd1 212 va_end(argptr);
9ef3052c 213
0fb67cd1 214 wxLogSysErrorHelper(wxSysErrorCode());
c801d85f
KB
215}
216
50920146 217void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
c801d85f 218{
0fb67cd1
VZ
219 va_list argptr;
220 va_start(argptr, szFormat);
50920146 221 wxVsprintf(s_szBuf, szFormat, argptr);
0fb67cd1 222 va_end(argptr);
c801d85f 223
0fb67cd1 224 wxLogSysErrorHelper(lErrCode);
c801d85f
KB
225}
226
227// ----------------------------------------------------------------------------
228// wxLog class implementation
229// ----------------------------------------------------------------------------
230
231wxLog::wxLog()
232{
0fb67cd1 233 m_bHasMessages = FALSE;
a2ace6ff 234
0fb67cd1 235 // enable verbose messages by default in the debug builds
a2ace6ff 236#ifdef __WXDEBUG__
0fb67cd1 237 m_bVerbose = TRUE;
a2ace6ff 238#else // release
0fb67cd1 239 m_bVerbose = FALSE;
a2ace6ff 240#endif // debug/release
c801d85f
KB
241}
242
9ec05cc9
VZ
243wxLog *wxLog::GetActiveTarget()
244{
0fb67cd1
VZ
245 if ( ms_bAutoCreate && ms_pLogger == NULL ) {
246 // prevent infinite recursion if someone calls wxLogXXX() from
247 // wxApp::CreateLogTarget()
248 static bool s_bInGetActiveTarget = FALSE;
249 if ( !s_bInGetActiveTarget ) {
250 s_bInGetActiveTarget = TRUE;
251
0fb67cd1
VZ
252 // ask the application to create a log target for us
253 if ( wxTheApp != NULL )
254 ms_pLogger = wxTheApp->CreateLogTarget();
255 else
256 ms_pLogger = new wxLogStderr;
0fb67cd1
VZ
257
258 s_bInGetActiveTarget = FALSE;
259
260 // do nothing if it fails - what can we do?
261 }
275bf4c1 262 }
c801d85f 263
0fb67cd1 264 return ms_pLogger;
c801d85f
KB
265}
266
c085e333 267wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
9ec05cc9 268{
0fb67cd1
VZ
269 if ( ms_pLogger != NULL ) {
270 // flush the old messages before changing because otherwise they might
271 // get lost later if this target is not restored
272 ms_pLogger->Flush();
273 }
c801d85f 274
0fb67cd1
VZ
275 wxLog *pOldLogger = ms_pLogger;
276 ms_pLogger = pLogger;
c085e333 277
0fb67cd1 278 return pOldLogger;
c801d85f
KB
279}
280
0fb67cd1 281void wxLog::RemoveTraceMask(const wxString& str)
c801d85f 282{
0fb67cd1
VZ
283 int index = ms_aTraceMasks.Index(str);
284 if ( index != wxNOT_FOUND )
285 ms_aTraceMasks.Remove((size_t)index);
286}
c801d85f 287
d2e1ef19
VZ
288void wxLog::TimeStamp(wxString *str)
289{
290 if ( ms_timestamp )
291 {
292 wxChar buf[256];
293 time_t timeNow;
294 (void)time(&timeNow);
c49245f8 295 wxStrftime(buf, WXSIZEOF(buf), ms_timestamp, localtime(&timeNow));
d2e1ef19
VZ
296
297 str->Empty();
223d09f6 298 *str << buf << wxT(": ");
d2e1ef19
VZ
299 }
300}
301
50920146 302void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
0fb67cd1 303{
0fb67cd1
VZ
304 switch ( level ) {
305 case wxLOG_FatalError:
786855a1 306 DoLogString(wxString(_("Fatal error: ")) + szString, t);
0fb67cd1
VZ
307 DoLogString(_("Program aborted."), t);
308 Flush();
309 abort();
310 break;
311
312 case wxLOG_Error:
786855a1 313 DoLogString(wxString(_("Error: ")) + szString, t);
0fb67cd1
VZ
314 break;
315
316 case wxLOG_Warning:
786855a1 317 DoLogString(wxString(_("Warning: ")) + szString, t);
0fb67cd1
VZ
318 break;
319
320 case wxLOG_Info:
0fb67cd1 321 if ( GetVerbose() )
37278984 322 case wxLOG_Message:
786855a1
VZ
323 default: // log unknown log levels too
324 DoLogString(szString, t);
0fb67cd1
VZ
325 // fall through
326
327 case wxLOG_Status:
328 // nothing to do
329 break;
330
331 case wxLOG_Trace:
332 case wxLOG_Debug:
333#ifdef __WXDEBUG__
334 DoLogString(szString, t);
335#endif
0fb67cd1 336 break;
0fb67cd1 337 }
c801d85f
KB
338}
339
74e3313b 340void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t))
c801d85f 341{
223d09f6 342 wxFAIL_MSG(wxT("DoLogString must be overriden if it's called."));
c801d85f
KB
343}
344
345void wxLog::Flush()
346{
0fb67cd1 347 // do nothing
c801d85f
KB
348}
349
350// ----------------------------------------------------------------------------
351// wxLogStderr class implementation
352// ----------------------------------------------------------------------------
353
354wxLogStderr::wxLogStderr(FILE *fp)
355{
0fb67cd1
VZ
356 if ( fp == NULL )
357 m_fp = stderr;
358 else
359 m_fp = fp;
c801d85f
KB
360}
361
74e3313b 362void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
c801d85f 363{
d2e1ef19
VZ
364 wxString str;
365 TimeStamp(&str);
223d09f6 366 str << szString << wxT('\n');
1e8a4bc2 367
50920146 368 fputs(str.mb_str(), m_fp);
0fb67cd1 369 fflush(m_fp);
1e8a4bc2 370
0fb67cd1
VZ
371 // under Windows, programs usually don't have stderr at all, so make show the
372 // messages also under debugger
1e8a4bc2 373#ifdef __WXMSW__
223d09f6 374 OutputDebugString(str + wxT('\r'));
1e8a4bc2 375#endif // MSW
c801d85f
KB
376}
377
378// ----------------------------------------------------------------------------
379// wxLogStream implementation
380// ----------------------------------------------------------------------------
381
4bf78aae 382#if wxUSE_STD_IOSTREAM
c801d85f
KB
383wxLogStream::wxLogStream(ostream *ostr)
384{
0fb67cd1
VZ
385 if ( ostr == NULL )
386 m_ostr = &cerr;
387 else
388 m_ostr = ostr;
c801d85f
KB
389}
390
74e3313b 391void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
c801d85f 392{
e90c1d2a 393 (*m_ostr) << wxConvertWX2MB(szString) << endl;
c801d85f 394}
0fb67cd1 395#endif // wxUSE_STD_IOSTREAM
c801d85f 396
c801d85f
KB
397// ============================================================================
398// Global functions/variables
399// ============================================================================
400
401// ----------------------------------------------------------------------------
402// static variables
403// ----------------------------------------------------------------------------
0fb67cd1
VZ
404
405wxLog *wxLog::ms_pLogger = (wxLog *)NULL;
406bool wxLog::ms_doLog = TRUE;
407bool wxLog::ms_bAutoCreate = TRUE;
d2e1ef19 408
223d09f6 409const wxChar *wxLog::ms_timestamp = wxT("%X"); // time only, no date
d2e1ef19 410
0fb67cd1
VZ
411wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0;
412wxArrayString wxLog::ms_aTraceMasks;
c801d85f
KB
413
414// ----------------------------------------------------------------------------
415// stdout error logging helper
416// ----------------------------------------------------------------------------
417
418// helper function: wraps the message and justifies it under given position
419// (looks more pretty on the terminal). Also adds newline at the end.
420//
0fb67cd1
VZ
421// TODO this is now disabled until I find a portable way of determining the
422// terminal window size (ok, I found it but does anybody really cares?)
423#ifdef LOG_PRETTY_WRAP
c801d85f
KB
424static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
425{
0fb67cd1
VZ
426 size_t nMax = 80; // FIXME
427 size_t nStart = strlen(pszPrefix);
428 fputs(pszPrefix, f);
429
430 size_t n;
431 while ( *psz != '\0' ) {
432 for ( n = nStart; (n < nMax) && (*psz != '\0'); n++ )
433 putc(*psz++, f);
434
435 // wrapped?
436 if ( *psz != '\0' ) {
437 /*putc('\n', f);*/
438 for ( n = 0; n < nStart; n++ )
439 putc(' ', f);
440
441 // as we wrapped, squeeze all white space
442 while ( isspace(*psz) )
443 psz++;
444 }
c801d85f 445 }
c801d85f 446
0fb67cd1 447 putc('\n', f);
c801d85f
KB
448}
449#endif //LOG_PRETTY_WRAP
450
451// ----------------------------------------------------------------------------
452// error code/error message retrieval functions
453// ----------------------------------------------------------------------------
454
455// get error code from syste
456unsigned long wxSysErrorCode()
457{
0fb67cd1
VZ
458#ifdef __WXMSW__
459#ifdef __WIN32__
460 return ::GetLastError();
461#else //WIN16
462 // TODO what to do on Windows 3.1?
463 return 0;
464#endif //WIN16/32
465#else //Unix
c801d85f 466 return errno;
0fb67cd1 467#endif //Win/Unix
c801d85f
KB
468}
469
470// get error message from system
50920146 471const wxChar *wxSysErrorMsg(unsigned long nErrCode)
c801d85f 472{
0fb67cd1
VZ
473 if ( nErrCode == 0 )
474 nErrCode = wxSysErrorCode();
475
476#ifdef __WXMSW__
477#ifdef __WIN32__
50920146 478 static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
0fb67cd1
VZ
479
480 // get error message from system
481 LPVOID lpMsgBuf;
482 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
483 NULL, nErrCode,
484 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
485 (LPTSTR)&lpMsgBuf,
486 0, NULL);
487
488 // copy it to our buffer and free memory
50920146 489 wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
223d09f6 490 s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
0fb67cd1
VZ
491 LocalFree(lpMsgBuf);
492
493 // returned string is capitalized and ended with '\r\n' - bad
50920146
OK
494 s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
495 size_t len = wxStrlen(s_szBuf);
0fb67cd1 496 if ( len > 0 ) {
9ef3052c 497 // truncate string
223d09f6
KB
498 if ( s_szBuf[len - 2] == wxT('\r') )
499 s_szBuf[len - 2] = wxT('\0');
0fb67cd1
VZ
500 }
501
502 return s_szBuf;
503#else //Win16
504 // TODO
505 return NULL;
506#endif // Win16/32
507#else // Unix
50920146
OK
508#if wxUSE_UNICODE
509 static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
dcf924a3 510 wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);
50920146
OK
511 return s_szBuf;
512#else
9ef3052c 513 return strerror(nErrCode);
50920146 514#endif
0fb67cd1 515#endif // Win/Unix
c801d85f
KB
516}
517
518// ----------------------------------------------------------------------------
519// debug helper
520// ----------------------------------------------------------------------------
521
b2aef89b 522#ifdef __WXDEBUG__
c801d85f 523
0fb67cd1 524// break into the debugger
7502ba29
VZ
525void Trap()
526{
0fb67cd1 527#ifdef __WXMSW__
7502ba29 528 DebugBreak();
0fb67cd1
VZ
529#elif defined(__WXMAC__)
530#if __powerc
17dff81c 531 Debugger();
0fb67cd1 532#else
17dff81c 533 SysBreak();
0fb67cd1
VZ
534#endif
535#elif defined(__UNIX__)
7502ba29 536 raise(SIGTRAP);
0fb67cd1
VZ
537#else
538 // TODO
539#endif // Win/Unix
7502ba29
VZ
540}
541
c801d85f 542// this function is called when an assert fails
6f9eb452 543void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
c801d85f 544{
0fb67cd1
VZ
545 // this variable can be set to true to suppress "assert failure" messages
546 static bool s_bNoAsserts = FALSE;
547 static bool s_bInAssert = FALSE; // FIXME MT-unsafe
7502ba29 548
0fb67cd1
VZ
549 if ( s_bInAssert ) {
550 // He-e-e-e-elp!! we're trapped in endless loop
551 Trap();
c085e333 552
0fb67cd1 553 s_bInAssert = FALSE;
1e8a4bc2 554
0fb67cd1
VZ
555 return;
556 }
7502ba29 557
0fb67cd1 558 s_bInAssert = TRUE;
c801d85f 559
50920146 560 wxChar szBuf[LOG_BUFFER_SIZE];
c263077e 561
0fb67cd1
VZ
562 // make life easier for people using VC++ IDE: clicking on the message
563 // will take us immediately to the place of the failed assert
3f4a0c5b 564#ifdef __VISUALC__
223d09f6 565 wxSprintf(szBuf, wxT("%s(%d): assert failed"), szFile, nLine);
c263077e 566#else // !VC++
0fb67cd1 567 // make the error message more clear for all the others
223d09f6 568 wxSprintf(szBuf, wxT("Assert failed in file %s at line %d"), szFile, nLine);
c263077e
VZ
569#endif // VC/!VC
570
0fb67cd1 571 if ( szMsg != NULL ) {
223d09f6 572 wxStrcat(szBuf, wxT(": "));
50920146 573 wxStrcat(szBuf, szMsg);
0fb67cd1
VZ
574 }
575 else {
223d09f6 576 wxStrcat(szBuf, wxT("."));
0fb67cd1 577 }
c801d85f 578
0fb67cd1
VZ
579 if ( !s_bNoAsserts ) {
580 // send it to the normal log destination
581 wxLogDebug(szBuf);
7502ba29 582
e90c1d2a 583#if wxUSE_GUI
0fb67cd1
VZ
584 // this message is intentionally not translated - it is for
585 // developpers only
223d09f6 586 wxStrcat(szBuf, wxT("\nDo you want to stop the program?"
0fb67cd1 587 "\nYou can also choose [Cancel] to suppress "
50920146 588 "further warnings."));
0fb67cd1
VZ
589
590 switch ( wxMessageBox(szBuf, _("Debug"),
591 wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
592 case wxYES:
593 Trap();
594 break;
595
596 case wxCANCEL:
597 s_bNoAsserts = TRUE;
598 break;
599
600 //case wxNO: nothing to do
601 }
e90c1d2a
VZ
602#else // !GUI
603 Trap();
604#endif // GUI/!GUI
0fb67cd1
VZ
605 }
606
607 s_bInAssert = FALSE;
c801d85f
KB
608}
609
b2aef89b 610#endif //WXDEBUG
c801d85f 611