X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ec05cc986d7be5cb2ae6429ef30cb83b9fee3ef..d1427b705318677afe28b1291867f6930c8823a7:/src/common/log.cpp diff --git a/src/common/log.cpp b/src/common/log.cpp index 8a50359699..d1e30401d4 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -32,6 +32,7 @@ #include #include #include + #include #include #include @@ -40,6 +41,7 @@ #include #include +#include #include // other standard headers @@ -151,7 +153,7 @@ void wxLogVerbose(const char *szFormat, ...) // 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); @@ -210,24 +212,27 @@ wxLog::wxLog() 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 ) { + 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; @@ -239,18 +244,15 @@ wxLog *wxLog::SetActiveTarget(wxLog *pLogger) if ( ms_pLogger != NULL ) ms_pLogger->Flush(); - ms_bInitialized = TRUE; - wxLog *pOldLogger = ms_pLogger; ms_pLogger = pLogger; return pOldLogger; } -void wxLog::DoLog(wxLogLevel level, const char *szString) +wxString wxLog::TimeStamp() const { wxString str; - // prepend a timestamp if not disabled if ( !IsEmpty(m_szTimeFormat) ) { char szBuf[128]; time_t timeNow; @@ -263,6 +265,14 @@ void wxLog::DoLog(wxLogLevel level, const char *szString) str = szBuf; } + return str; +} + +void wxLog::DoLog(wxLogLevel level, const char *szString) +{ + // prepend a timestamp if not disabled + wxString str = TimeStamp(); + switch ( level ) { case wxLOG_FatalError: DoLogString(str << _("Fatal error: ") << szString); @@ -292,11 +302,6 @@ void wxLog::DoLog(wxLogLevel level, const char *szString) case wxLOG_Trace: case wxLOG_Debug: #ifdef __WXDEBUG__ - #ifdef __WIN32__ - // in addition to normal logging, also send the string to debugger - // (don't prepend "Debug" here: it will go to debug window anyhow) - ::OutputDebugString(str + szString + "\n\r"); - #endif //Win32 DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug")) << ": " << szString); #endif @@ -304,13 +309,13 @@ void wxLog::DoLog(wxLogLevel level, const char *szString) break; default: - wxFAIL_MSG("unknown log level in wxLog::DoLog"); + wxFAIL_MSG(_("unknown log level in wxLog::DoLog")); } } -void wxLog::DoLogString(const char *szString) +void wxLog::DoLogString(const char *WXUNUSED(szString)) { - wxFAIL_MSG("DoLogString must be overrided if it's called."); + wxFAIL_MSG(_("DoLogString must be overrided if it's called.")); } void wxLog::Flush() @@ -359,17 +364,18 @@ void wxLogStream::DoLogString(const char *szString) // ---------------------------------------------------------------------------- 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; } // ---------------------------------------------------------------------------- @@ -449,15 +455,22 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString) case wxLOG_Trace: case wxLOG_Debug: #ifdef __WXDEBUG__ - #ifdef __WIN32__ - OutputDebugString(szString); - OutputDebugString("\n\r"); - #else //!WIN32 - // send them to stderr - fprintf(stderr, "%s: %s\n", - level == wxLOG_Trace ? _("Trace") : _("Debug"), szString); - fflush(stderr); - #endif // WIN32 + { + wxString strTime = TimeStamp(); + + #ifdef __WIN32__ + // 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 + // send them to stderr + fprintf(stderr, "%s %s: %s\n", + strTime.c_str(), + level == wxLOG_Trace ? _("Trace") : _("Debug"), + szString); + fflush(stderr); + #endif // WIN32 + } #endif break; @@ -479,20 +492,22 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString) break; default: - wxFAIL_MSG("unknown log level in wxLogGui::DoLog"); + wxFAIL_MSG(_("unknown log level in wxLogGui::DoLog")); } } // ---------------------------------------------------------------------------- -// wxLogWindow implementation +// wxLogWindow and wxLogFrame implementation // ---------------------------------------------------------------------------- // log frame class +// --------------- class wxLogFrame : public wxFrame { public: - // ctor - wxLogFrame(const char *szTitle); + // ctor & dtor + wxLogFrame(wxLogWindow *log, const char *szTitle); + virtual ~wxLogFrame(); // menu callbacks void OnClose(wxCommandEvent& event); @@ -500,6 +515,8 @@ public: void OnSave (wxCommandEvent& event); void OnClear(wxCommandEvent& event); + void OnIdle(wxIdleEvent&); + // accessors wxTextCtrl *TextCtrl() const { return m_pTextCtrl; } @@ -511,7 +528,11 @@ private: Menu_Clear }; - wxTextCtrl *m_pTextCtrl; + // instead of closing just hide the window to be able to Show() it later + void DoClose() { Show(FALSE); } + + wxTextCtrl *m_pTextCtrl; + wxLogWindow *m_log; DECLARE_EVENT_TABLE() }; @@ -523,17 +544,17 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame) EVT_MENU(Menu_Clear, wxLogFrame::OnClear) EVT_CLOSE(wxLogFrame::OnCloseWindow) + + EVT_IDLE(wxLogFrame::OnIdle) END_EVENT_TABLE() -wxLogFrame::wxLogFrame(const char *szTitle) +wxLogFrame::wxLogFrame(wxLogWindow *log, const char *szTitle) : wxFrame(NULL, -1, szTitle) { - // we don't want to be a top-level frame because it would prevent the - // application termination when all other frames are closed - wxTopLevelWindows.DeleteObject(this); + m_log = log; // @@ kludge: wxSIMPLE_BORDER is simply to prevent wxWindows from creating - // a rich edit control instead of a normal one we want + // a rich edit control instead of a normal one we want in wxMSW m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSIMPLE_BORDER | @@ -548,29 +569,38 @@ wxLogFrame::wxLogFrame(const char *szTitle) // create menu wxMenuBar *pMenuBar = new wxMenuBar; wxMenu *pMenu = new wxMenu; - pMenu->Append(Menu_Save, "&Save..."); - pMenu->Append(Menu_Clear, "C&lear"); + pMenu->Append(Menu_Save, _("&Save..."), _("Save log contents to file")); + pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents")); pMenu->AppendSeparator(); - pMenu->Append(Menu_Close, "&Close"); - pMenuBar->Append(pMenu, "&Log"); + pMenu->Append(Menu_Close, _("&Close"), _("Close this window")); + pMenuBar->Append(pMenu, _("&Log")); SetMenuBar(pMenuBar); - // @@ what about status bar? needed (for menu prompts)? + // status bar for menu prompts + CreateStatusBar(); + + m_log->OnFrameCreate(this); } -void wxLogFrame::OnClose(wxCommandEvent& event) +void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event)) { - // just hide the window - Show(FALSE); + DoClose(); } -void wxLogFrame::OnCloseWindow(wxCloseEvent& event) +void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event)) { - // just hide the window - Show(FALSE); + DoClose(); } -void wxLogFrame::OnSave(wxCommandEvent& event) +void wxLogFrame::OnIdle(wxIdleEvent& WXUNUSED(event)) +{ + // if we're the last frame to stay, delete log frame letting the + // application to close + if ( wxTopLevelWindows.Number() == 1 ) + Destroy(); +} + +void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event)) { // get the file name // ----------------- @@ -583,13 +613,13 @@ void wxLogFrame::OnSave(wxCommandEvent& event) // 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); - switch ( wxMessageBox(strMsg, "Question", wxYES_NO | wxCANCEL) ) { + switch ( wxMessageBox(strMsg, _("Question"), wxYES_NO | wxCANCEL) ) { case wxYES: bAppend = TRUE; break; @@ -602,7 +632,7 @@ void wxLogFrame::OnSave(wxCommandEvent& event) return; default: - wxFAIL_MSG("invalid message box return value"); + wxFAIL_MSG(_("invalid message box return value")); } if ( bAppend ) { @@ -620,7 +650,7 @@ void wxLogFrame::OnSave(wxCommandEvent& event) // ------------------------- #ifdef __WXGTK__ // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet - wxLogError("Sorry, this function is not implemented under GTK"); + wxLogError(_("Sorry, this function is not implemented under GTK")); #else int nLines = m_pTextCtrl->GetNumberOfLines(); for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) { @@ -637,15 +667,24 @@ void wxLogFrame::OnSave(wxCommandEvent& event) } } -void wxLogFrame::OnClear(wxCommandEvent& event) +void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event)) { m_pTextCtrl->Clear(); } -wxLogWindow::wxLogWindow(const char *szTitle, bool bShow) +wxLogFrame::~wxLogFrame() +{ + m_log->OnFrameDelete(this); +} + +// wxLogWindow +// ----------- +wxLogWindow::wxLogWindow(const char *szTitle, bool bShow, bool bDoPass) { - m_pOldLog = wxLog::GetActiveTarget(); - m_pLogFrame = new wxLogFrame(szTitle); + m_bPassMessages = bDoPass; + + m_pLogFrame = new wxLogFrame(this, szTitle); + m_pOldLog = wxLog::SetActiveTarget(this); if ( bShow ) m_pLogFrame->Show(TRUE); @@ -656,10 +695,18 @@ void wxLogWindow::Show(bool bShow) m_pLogFrame->Show(bShow); } +void wxLogWindow::Flush() +{ + if ( m_pOldLog != NULL ) + m_pOldLog->Flush(); + + m_bHasMessages = FALSE; +} + void wxLogWindow::DoLog(wxLogLevel level, const char *szString) { // first let the previous logger show it - if ( m_pOldLog != NULL ) { + 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 @@ -669,6 +716,8 @@ void wxLogWindow::DoLog(wxLogLevel level, const char *szString) // and this will format it nicely and call our DoLogString() wxLog::DoLog(level, szString); + + m_bHasMessages = TRUE; } void wxLogWindow::DoLogString(const char *szString) @@ -689,9 +738,27 @@ void wxLogWindow::DoLogString(const char *szString) // @@@ TODO } +wxFrame *wxLogWindow::GetFrame() const +{ + return m_pLogFrame; +} + +void wxLogWindow::OnFrameCreate(wxFrame *frame) +{ +} + +void wxLogWindow::OnFrameDelete(wxFrame *frame) +{ + m_pLogFrame = NULL; +} + wxLogWindow::~wxLogWindow() { - m_pLogFrame->Close(TRUE); + // may be NULL if log frame already auto destroyed itself + delete m_pLogFrame; + + // delete the old log + delete m_pOldLog; } #endif //WX_TEST_MINIMAL @@ -704,7 +771,8 @@ wxLogWindow::~wxLogWindow() // 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 @@ -786,7 +854,7 @@ const char *wxSysErrorMsg(unsigned long nErrCode) 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