#include <wx/app.h>
#include <wx/string.h>
#include <wx/intl.h>
+ #include <wx/menu.h>
#include <wx/generic/msgdlgg.h>
#include <wx/filedlg.h>
#include <wx/file.h>
#include <wx/textfile.h>
+#include <wx/utils.h>
#include <wx/log.h>
// other standard headers
// 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);
m_bHasMessages = FALSE;
m_bVerbose = FALSE;
m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
- m_ulTraceMask = (wxTraceMask)0; // -1 to 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)
DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug"))
<< ": " << szString);
#endif
-
+
break;
default:
}
}
-void wxLog::DoLogString(const char *szString)
+void wxLog::DoLogString(const char *WXUNUSED(szString))
{
wxFAIL_MSG("DoLogString must be overrided if it's called.");
}
// ----------------------------------------------------------------------------
wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
// @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
-#ifndef __WXGTK__
+
+// 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 __WXGTK__
- delete m_ostr;
- #endif //GTK
+ delete m_ostr;
}
// ----------------------------------------------------------------------------
return;
// @@@ ugly...
-
+
// concatenate all strings (but not too many to not overfill the msg box)
wxString str;
- uint nLines = 0,
+ uint nLines = 0,
nMsgCount = m_aMessages.Count();
// start from the most recent message
m_aMessages.Add(szString);
break;
-
+
default:
wxFAIL_MSG("unknown log level in wxLogGui::DoLog");
}
EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
EVT_CLOSE(wxLogFrame::OnCloseWindow)
-END_EVENT_TABLE()
+END_EVENT_TABLE()
wxLogFrame::wxLogFrame(const char *szTitle)
: wxFrame(NULL, -1, szTitle)
// @@ what about status bar? needed (for menu prompts)?
}
-void wxLogFrame::OnClose(wxCommandEvent& event)
+void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event))
{
// just hide the window
Show(FALSE);
}
-void wxLogFrame::OnCloseWindow(wxCloseEvent& event)
+void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
{
// just hide the window
Show(FALSE);
}
-void wxLogFrame::OnSave(wxCommandEvent& event)
+void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
{
// get the file name
// -----------------
// 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);
// retrieve text and save it
// -------------------------
-
#ifdef __WXGTK__
// @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
wxLogError("Sorry, this function is not implemented under GTK");
bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL());
}
#endif //GTK
-
+
if ( bOk )
bOk = file.Close();
}
}
-void wxLogFrame::OnClear(wxCommandEvent& event)
+void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
{
m_pTextCtrl->Clear();
}
-wxLogWindow::wxLogWindow(const char *szTitle, bool bShow)
+wxLogWindow::wxLogWindow(const char *szTitle, bool bShow, bool bDoPass)
{
- m_pOldLog = wxLog::GetActiveTarget();
+ m_bPassMessages = bDoPass;
+
m_pLogFrame = new wxLogFrame(szTitle);
-
+ m_pOldLog = wxLog::SetActiveTarget(this);
+
if ( bShow )
m_pLogFrame->Show(TRUE);
}
m_pLogFrame->Show(bShow);
}
+wxFrame *wxLogWindow::GetFrame() const
+{
+ return m_pLogFrame;
+}
+
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);
}
// static variables
// ----------------------------------------------------------------------------
wxLog *wxLog::ms_pLogger = NULL;
-bool wxLog::ms_bInitialized = FALSE;
+bool wxLog::ms_bAutoCreate = TRUE;
+wxTraceMask wxLog::ms_ulTraceMask = (wxTraceMask)0;
// ----------------------------------------------------------------------------
// stdout error logging helper
// 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);
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
strcat(szBuf, ".");
}
- // send it to the normal log destination
- wxLogDebug(szBuf);
-
if ( !s_bNoAsserts ) {
+ // 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."));
case wxCANCEL:
s_bNoAsserts = TRUE;
break;
-
+
//case wxNO: nothing to do
}
}
projects / wxWidgets.git / blobdiff