if ( !s_bInGetActiveTarget ) {
s_bInGetActiveTarget = TRUE;
- #ifdef WX_TEST_MINIMAL
+ #ifdef wxUSE_NOGUI
ms_pLogger = new wxLogStderr;
#else
// ask the application to create a log target for us
ms_pLogger = wxTheApp->CreateLogTarget();
#endif
+ s_bInGetActiveTarget = FALSE;
+
// do nothing if it fails - what can we do?
}
}
return ms_pLogger;
}
-wxLog *wxLog::SetActiveTarget(wxLog *pLogger, bool bNoFlashOld)
+wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
{
- // flush the old messages before changing
- if ( (ms_pLogger != NULL) && !bNoFlashOld )
+ if ( ms_pLogger != NULL ) {
+ // flush the old messages before changing because otherwise they might
+ // get lost later if this target is not restored
ms_pLogger->Flush();
+ }
wxLog *pOldLogger = ms_pLogger;
ms_pLogger = pLogger;
+
return pOldLogger;
}
{
wxString str;
+/* Let's disable TimeStamp and see if anyone complains.
+ * If not, we'll remove it, since it's probably unlikely
+ * to ever be used. -- JACS 22/11/98
if ( !IsEmpty(m_szTimeFormat) ) {
char szBuf[128];
time_t timeNow;
strftime(szBuf, WXSIZEOF(szBuf), m_szTimeFormat, ptmNow);
str = szBuf;
}
+*/
return str;
}
case wxLOG_Trace:
case wxLOG_Debug:
#ifdef __WXDEBUG__
- DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug"))
- << ": " << szString);
+ // DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug"))
+ // << ": " << szString);
+ // JACS: we don't really want to prefix with 'Debug'. It's just extra
+ // verbiage.
+ DoLogString(szString);
#endif
break;
(*m_ostr) << szString << endl << flush;
}
+#ifndef wxUSE_NOGUI
// ----------------------------------------------------------------------------
// wxLogTextCtrl implementation
// ----------------------------------------------------------------------------
// wxLogGui implementation
// ----------------------------------------------------------------------------
-#ifndef WX_TEST_MINIMAL
-
wxLogGui::wxLogGui()
{
m_bErrors = FALSE;
{
wxString strTime = TimeStamp();
- #if defined(__WIN32__) && !defined(__WXSTUBS__)
+ #ifdef __WXMSW__
// 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
+ #else
// send them to stderr
+ /*
fprintf(stderr, "%s %s: %s\n",
strTime.c_str(),
level == wxLOG_Trace ? _("Trace") : _("Debug"),
szString);
+ */
+ fprintf(stderr, "%s\n",
+ szString);
fflush(stderr);
- #endif // WIN32
+ #endif
}
#endif
break;
((wxLogWindow *)m_pOldLog)->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);
+ if ( m_pLogFrame ) {
+ switch ( level ) {
+ case wxLOG_Status:
+ // by default, these messages are ignored by wxLog, so process
+ // them ourselves
+ {
+ wxString str = TimeStamp();
+ str << _("Status: ") << szString;
+ DoLogString(str);
+ }
+ break;
+
+ // 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
+ case wxLOG_Trace:
+ break;
+
+ default:
+ // and this will format it nicely and call our DoLogString()
+ wxLog::DoLog(level, szString);
+ }
}
m_bHasMessages = TRUE;
pText->WriteText(szString);
pText->WriteText("\n"); // "\n" ok here (_not_ "\r\n")
- // ensure that the line can be seen
- // @@@ TODO
+ // TODO ensure that the line can be seen
}
wxFrame *wxLogWindow::GetFrame() const
return m_pLogFrame;
}
-void wxLogWindow::OnFrameCreate(wxFrame *frame)
+void wxLogWindow::OnFrameCreate(wxFrame *WXUNUSED(frame))
{
}
-void wxLogWindow::OnFrameDelete(wxFrame *frame)
+void wxLogWindow::OnFrameDelete(wxFrame *WXUNUSED(frame))
{
- m_pLogFrame = (wxLogFrame *) NULL;
+ m_pLogFrame = (wxLogFrame *)NULL;
}
wxLogWindow::~wxLogWindow()
{
+ delete m_pOldLog;
+
// may be NULL if log frame already auto destroyed itself
delete m_pLogFrame;
}
-#endif //WX_TEST_MINIMAL
+#endif //wxUSE_NOGUI
// ============================================================================
// Global functions/variables
// static variables
// ----------------------------------------------------------------------------
wxLog *wxLog::ms_pLogger = (wxLog *) NULL;
+bool wxLog::ms_doLog = TRUE;
bool wxLog::ms_bAutoCreate = TRUE;
wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0;
if ( s_bInAssert ) {
// He-e-e-e-elp!! we're trapped in endless loop
Trap();
+
+ return;
}
s_bInAssert = TRUE;
// 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."));
+ #ifdef wxUSE_NOGUI
+ Trap();
+ #else
+ strcat(szBuf, _("\nDo you want to stop the program?"
+ "\nYou can also choose [Cancel] to suppress "
+ "further warnings."));
- switch ( wxMessageBox(szBuf, _("Debug"),
- wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
- case wxYES:
- Trap();
- break;
+ switch ( wxMessageBox(szBuf, _("Debug"),
+ wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
+ case wxYES:
+ Trap();
+ break;
- case wxCANCEL:
- s_bNoAsserts = TRUE;
- break;
+ case wxCANCEL:
+ s_bNoAsserts = TRUE;
+ break;
- //case wxNO: nothing to do
- }
+ //case wxNO: nothing to do
+ }
+ #endif // USE_NOGUI
}
s_bInAssert = FALSE;
projects / wxWidgets.git / blobdiff