static wxFile::Access() added

[wxWidgets.git] / src / common / log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 525f8cfd190ddd5fb0947b1f075c00e3c856f544..d1e30401d462b7ae3952d809987e6440e3deeb55 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -153,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.
     // 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);
       va_list argptr;
       va_start(argptr, szFormat);
       vsprintf(s_szBuf, szFormat, argptr);


@@ -249,11 +249,10 @@ wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
   return pOldLogger;
 }
 
   return pOldLogger;
 }
 

-void wxLog::DoLog(wxLogLevel level, const char *szString)
+wxString wxLog::TimeStamp() const

 {
   wxString str;
 
 {
   wxString str;
 

-  // prepend a timestamp if not disabled

   if ( !IsEmpty(m_szTimeFormat) ) {
     char szBuf[128];
     time_t timeNow;
   if ( !IsEmpty(m_szTimeFormat) ) {
     char szBuf[128];
     time_t timeNow;


@@ -266,6 +265,14 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
     str = szBuf;
   }
 
     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);
   switch ( level ) {
     case wxLOG_FatalError:
       DoLogString(str << _("Fatal error: ") << szString);


@@ -295,11 +302,6 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
     case wxLOG_Trace:
     case wxLOG_Debug:
       #ifdef __WXDEBUG__
     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
         DoLogString(str << (level == wxLOG_Trace ? _("Trace") : _("Debug"))
                         << ": " << szString);
       #endif


@@ -307,13 +309,13 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
       break;
 
     default:
       break;
 
     default:

-      wxFAIL_MSG("unknown log level in wxLog::DoLog");
+      wxFAIL_MSG(_("unknown log level in wxLog::DoLog"));

   }
 }
 
 void wxLog::DoLogString(const char *WXUNUSED(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()
 }
 
 void wxLog::Flush()


@@ -362,17 +364,18 @@ void wxLogStream::DoLogString(const char *szString)
 // ----------------------------------------------------------------------------
 wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
 // @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf
 // ----------------------------------------------------------------------------
 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))
              : wxLogStream(new ostream(pTextCtrl))

-#endif //GTK
+#endif

 {
 }
 
 wxLogTextCtrl::~wxLogTextCtrl()
 {
 {
 }
 
 wxLogTextCtrl::~wxLogTextCtrl()
 {

-  #ifndef __WXGTK__
-    delete m_ostr;
-  #endif //GTK
+  delete m_ostr;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -452,15 +455,22 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
     case wxLOG_Trace:
     case wxLOG_Debug:
       #ifdef __WXDEBUG__
     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;
 
       #endif
       break;
 


@@ -482,20 +492,22 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
       break;
 
     default:
       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
 // ----------------------------------------------------------------------------
 
 // log frame class

+// ---------------

 class wxLogFrame : public wxFrame
 {
 public:
 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);
 
   // menu callbacks
   void OnClose(wxCommandEvent& event);


@@ -503,6 +515,8 @@ public:
   void OnSave (wxCommandEvent& event);
   void OnClear(wxCommandEvent& event);
 
   void OnSave (wxCommandEvent& event);
   void OnClear(wxCommandEvent& event);
 

+  void OnIdle(wxIdleEvent&);
+

   // accessors
   wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
 
   // accessors
   wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
 


@@ -514,7 +528,11 @@ private:
     Menu_Clear
   };
 
     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()
 };
 
   DECLARE_EVENT_TABLE()
 };


@@ -526,17 +544,17 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
   EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
 
   EVT_CLOSE(wxLogFrame::OnCloseWindow)
   EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
 
   EVT_CLOSE(wxLogFrame::OnCloseWindow)

+
+  EVT_IDLE(wxLogFrame::OnIdle)

 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 

-wxLogFrame::wxLogFrame(const char *szTitle)
+wxLogFrame::wxLogFrame(wxLogWindow *log, const char *szTitle)

           : wxFrame(NULL, -1, 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
 
   // @@ 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 |
   m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
                                wxDefaultSize,
                                wxSIMPLE_BORDER |


@@ -551,26 +569,35 @@ wxLogFrame::wxLogFrame(const char *szTitle)
   // create menu
   wxMenuBar *pMenuBar = new wxMenuBar;
   wxMenu *pMenu = new wxMenu;
   // 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->AppendSeparator();

-  pMenu->Append(Menu_Close, "&Close");
-  pMenuBar->Append(pMenu, "&Log");
+  pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
+  pMenuBar->Append(pMenu, _("&Log"));

   SetMenuBar(pMenuBar);
 
   SetMenuBar(pMenuBar);
 

-  // @@ what about status bar? needed (for menu prompts)?
+  // status bar for menu prompts
+  CreateStatusBar();
+
+  m_log->OnFrameCreate(this);

 }
 
 void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event))
 {

-  // just hide the window
-  Show(FALSE);
+  DoClose();

 }
 
 void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {
 }
 
 void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 {

-  // just hide the window
-  Show(FALSE);
+  DoClose();
+}
+
+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))
 }
 
 void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))


@@ -592,7 +619,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
     wxString strMsg;
     strMsg.Printf(_("Append log to file '%s' "
                     "(choosing [No] will overwrite it)?"), szFileName);
     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;
       case wxYES:
         bAppend = TRUE;
         break;


@@ -605,7 +632,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
         return;
 
       default:
         return;
 
       default:

-        wxFAIL_MSG("invalid message box return value");
+        wxFAIL_MSG(_("invalid message box return value"));

     }
 
     if ( bAppend ) {
     }
 
     if ( bAppend ) {


@@ -623,7 +650,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
   // -------------------------
 #ifdef __WXGTK__
   // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
   // -------------------------
 #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++ ) {
 #else
   int nLines = m_pTextCtrl->GetNumberOfLines();
   for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {


@@ -645,10 +672,19 @@ void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
   m_pTextCtrl->Clear();
 }
 
   m_pTextCtrl->Clear();
 }
 

-wxLogWindow::wxLogWindow(const char *szTitle, bool bShow)
+wxLogFrame::~wxLogFrame()

 {
 {

-  m_pOldLog = wxLog::GetActiveTarget();
-  m_pLogFrame = new wxLogFrame(szTitle);
+  m_log->OnFrameDelete(this);
+}
+
+// wxLogWindow
+// -----------
+wxLogWindow::wxLogWindow(const char *szTitle, bool bShow, bool bDoPass)
+{
+  m_bPassMessages = bDoPass;
+
+  m_pLogFrame = new wxLogFrame(this, szTitle);
+  m_pOldLog = wxLog::SetActiveTarget(this);

 
   if ( bShow )
     m_pLogFrame->Show(TRUE);
 
   if ( bShow )
     m_pLogFrame->Show(TRUE);


@@ -659,10 +695,18 @@ void wxLogWindow::Show(bool bShow)
   m_pLogFrame->Show(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
 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
     // @@@ 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


@@ -672,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);
 
   // and this will format it nicely and call our DoLogString()
   wxLog::DoLog(level, szString);

+
+  m_bHasMessages = TRUE;

 }
 
 void wxLogWindow::DoLogString(const char *szString)
 }
 
 void wxLogWindow::DoLogString(const char *szString)


@@ -692,9 +738,27 @@ void wxLogWindow::DoLogString(const char *szString)
   // @@@ TODO
 }
 
   // @@@ TODO
 }
 

+wxFrame *wxLogWindow::GetFrame() const
+{
+  return m_pLogFrame;
+}
+
+void wxLogWindow::OnFrameCreate(wxFrame *frame)
+{
+}
+
+void wxLogWindow::OnFrameDelete(wxFrame *frame)
+{
+  m_pLogFrame = NULL;
+}
+

 wxLogWindow::~wxLogWindow()
 {
 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
 }
 
 #endif  //WX_TEST_MINIMAL