FreeBSD compilation fixes

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 6a1848932c0e2dbe112e6de3f64919f4fcaa4810..c1e68f3467e1077a01240cf6cfe735ce895fb6be 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -29,13 +29,13 @@
 
 // wxWindows
 #ifndef WX_PRECOMP
 
 // wxWindows
 #ifndef WX_PRECOMP

+  #include  <wx/event.h>

   #include  <wx/app.h>
   #include  <wx/string.h>
   #include  <wx/intl.h>
   #include  <wx/menu.h>
   #include  <wx/frame.h>
   #include  <wx/app.h>
   #include  <wx/string.h>
   #include  <wx/intl.h>
   #include  <wx/menu.h>
   #include  <wx/frame.h>

-
-  #include  <wx/generic/msgdlgg.h>
+  #include  <wx/msgdlg.h>

   #include  <wx/filedlg.h>
   #include  <wx/textctrl.h>
 #endif //WX_PRECOMP
   #include  <wx/filedlg.h>
   #include  <wx/textctrl.h>
 #endif //WX_PRECOMP


@@ -52,6 +52,8 @@
 
 #ifdef  __WXMSW__
   #include  <windows.h>
 
 #ifdef  __WXMSW__
   #include  <windows.h>

+  // Redefines OutputDebugString if necessary
+  #include  "wx/msw/private.h"

 #else   //Unix
   #include  <signal.h>
 #endif  //Win/Unix
 #else   //Unix
   #include  <signal.h>
 #endif  //Win/Unix


@@ -237,7 +239,14 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, const char *szFormat, ...)
 wxLog::wxLog()
 {
   m_bHasMessages = FALSE;
 wxLog::wxLog()
 {
   m_bHasMessages = FALSE;

-  m_bVerbose     = FALSE;
+
+  // enable verbose messages by default in the debug builds
+#ifdef __WXDEBUG__
+  m_bVerbose = TRUE;
+#else // release
+  m_bVerbose = FALSE;
+#endif // debug/release
+

   m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
 }
 
   m_szTimeFormat = "[%d/%b/%y %H:%M:%S] ";
 }
 


@@ -250,14 +259,18 @@ wxLog *wxLog::GetActiveTarget()
     if ( !s_bInGetActiveTarget ) {
       s_bInGetActiveTarget = TRUE;
 
     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
         if ( wxTheApp != NULL )
           ms_pLogger = wxTheApp->CreateLogTarget();
         ms_pLogger = new wxLogStderr;
       #else
         // ask the application to create a log target for us
         if ( wxTheApp != NULL )
           ms_pLogger = wxTheApp->CreateLogTarget();

+        else
+          ms_pLogger = new wxLogStderr;

       #endif
 
       #endif
 

+      s_bInGetActiveTarget = FALSE;
+

       // do nothing if it fails - what can we do?
     }
   }
       // do nothing if it fails - what can we do?
     }
   }


@@ -265,14 +278,17 @@ wxLog *wxLog::GetActiveTarget()
   return ms_pLogger;
 }
 
   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();
     ms_pLogger->Flush();

+  }

 
   wxLog *pOldLogger = ms_pLogger;
   ms_pLogger = pLogger;
 
   wxLog *pOldLogger = ms_pLogger;
   ms_pLogger = pLogger;

+

   return pOldLogger;
 }
 
   return pOldLogger;
 }
 


@@ -280,6 +296,9 @@ wxString wxLog::TimeStamp() const
 {
   wxString str;
 
 {
   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;
   if ( !IsEmpty(m_szTimeFormat) ) {
     char szBuf[128];
     time_t timeNow;


@@ -291,6 +310,7 @@ wxString wxLog::TimeStamp() const
     strftime(szBuf, WXSIZEOF(szBuf), m_szTimeFormat, ptmNow);
     str = szBuf;
   }
     strftime(szBuf, WXSIZEOF(szBuf), m_szTimeFormat, ptmNow);
     str = szBuf;
   }

+*/

 
   return str;
 }
 
   return str;
 }


@@ -317,8 +337,8 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
       break;
 
     case wxLOG_Info:
       break;
 
     case wxLOG_Info:

-      if ( GetVerbose() )

     case wxLOG_Message:
     case wxLOG_Message:

+      if ( GetVerbose() )

         DoLogString(str + szString);
       // fall through
 
         DoLogString(str + szString);
       // fall through
 


@@ -329,8 +349,11 @@ void wxLog::DoLog(wxLogLevel level, const char *szString)
     case wxLOG_Trace:
     case wxLOG_Debug:
       #ifdef __WXDEBUG__
     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;
       #endif
 
       break;


@@ -373,6 +396,7 @@ void wxLogStderr::DoLogString(const char *szString)
 // wxLogStream implementation
 // ----------------------------------------------------------------------------
 
 // wxLogStream implementation
 // ----------------------------------------------------------------------------
 

+#if wxUSE_STD_IOSTREAM

 wxLogStream::wxLogStream(ostream *ostr)
 {
   if ( ostr == NULL )
 wxLogStream::wxLogStream(ostream *ostr)
 {
   if ( ostr == NULL )


@@ -385,14 +409,17 @@ void wxLogStream::DoLogString(const char *szString)
 {
   (*m_ostr) << szString << endl << flush;
 }
 {
   (*m_ostr) << szString << endl << flush;
 }

+#endif
+
+#ifndef   wxUSE_NOGUI

 
 // ----------------------------------------------------------------------------
 // wxLogTextCtrl implementation
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxLogTextCtrl implementation
 // ----------------------------------------------------------------------------

-wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
-// @@@ TODO: in wxGTK wxTextCtrl doesn't derive from streambuf

 
 

-// Also, in DLL mode in wxMSW, can't use it.
+#if wxUSE_STD_IOSTREAM
+wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
+// DLL mode in wxMSW, can't use it.

 #if defined(NO_TEXT_WINDOW_STREAM)
 #else
              : wxLogStream(new ostream(pTextCtrl))
 #if defined(NO_TEXT_WINDOW_STREAM)
 #else
              : wxLogStream(new ostream(pTextCtrl))


@@ -404,13 +431,12 @@ wxLogTextCtrl::~wxLogTextCtrl()
 {
   delete m_ostr;
 }
 {
   delete m_ostr;
 }

+#endif

 
 // ----------------------------------------------------------------------------
 // wxLogGui implementation
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // wxLogGui implementation
 // ----------------------------------------------------------------------------
 

-#ifndef   WX_TEST_MINIMAL
-

 wxLogGui::wxLogGui()
 {
   m_bErrors = FALSE;
 wxLogGui::wxLogGui()
 {
   m_bErrors = FALSE;


@@ -492,18 +518,22 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
         {
           wxString strTime = TimeStamp();
 
         {
           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");
               // 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
             // send them to stderr

+    /*

             fprintf(stderr, "%s %s: %s\n",
                     strTime.c_str(),
                     level == wxLOG_Trace ? _("Trace") : _("Debug"),
                     szString);
             fprintf(stderr, "%s %s: %s\n",
                     strTime.c_str(),
                     level == wxLOG_Trace ? _("Trace") : _("Debug"),
                     szString);

+     */
+            fprintf(stderr, "%s\n",
+                    szString);

             fflush(stderr);
             fflush(stderr);

-          #endif  // WIN32
+          #endif

         }
       #endif
       break;
         }
       #endif
       break;


@@ -668,22 +698,26 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 
   // retrieve text and save it
   // -------------------------
 
   // retrieve text and save it
   // -------------------------

-#ifdef __WXGTK__
-  // @@@@ TODO: no GetNumberOfLines and GetLineText in wxGTK yet
-  wxLogError(_("Sorry, this function is not implemented under GTK"));
-#else

   int nLines = m_pTextCtrl->GetNumberOfLines();
   for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {
   int nLines = m_pTextCtrl->GetNumberOfLines();
   for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {

-    bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + wxTextFile::GetEOL());
+    bOk = file.Write(m_pTextCtrl->GetLineText(nLine) + 
+// we're not going to pull in the whole wxTextFile if all we need is this...
+#if wxUSE_TEXTFILE
+                     wxTextFile::GetEOL()
+#else // !wxUSE_TEXTFILE
+                       '\n'
+#endif // wxUSE_TEXTFILE
+                    );

   }
   }

-#endif //GTK

 
   if ( bOk )
     bOk = file.Close();
 
   if ( !bOk ) {
     wxLogError(_("Can't save log contents to file."));
 
   if ( bOk )
     bOk = file.Close();
 
   if ( !bOk ) {
     wxLogError(_("Can't save log contents to file."));

-    return;
+  }
+  else {
+    wxLogStatus(this, _("Log saved to the file '%s'."), szFileName);

   }
 }
 
   }
 }
 


@@ -737,13 +771,29 @@ void wxLogWindow::DoLog(wxLogLevel level, const char *szString)
     ((wxLogWindow *)m_pOldLog)->DoLog(level, szString);
   }
 
     ((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;
   }
 
   m_bHasMessages = TRUE;


@@ -763,8 +813,7 @@ void wxLogWindow::DoLogString(const char *szString)
   pText->WriteText(szString);
   pText->WriteText("\n"); // "\n" ok here (_not_ "\r\n")
 
   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
 }
 
 wxFrame *wxLogWindow::GetFrame() const


@@ -772,22 +821,24 @@ wxFrame *wxLogWindow::GetFrame() const
   return m_pLogFrame;
 }
 
   return m_pLogFrame;
 }
 

-void wxLogWindow::OnFrameCreate(wxFrame *WXUNUSED(frame))
+void wxLogWindow::OnFrameCreate(wxFrame * WXUNUSED(frame))

 {
 }
 
 {
 }
 

-void wxLogWindow::OnFrameDelete(wxFrame *WXUNUSED(frame))
+void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))

 {
 {

-  m_pLogFrame = (wxLogFrame *) NULL;
+  m_pLogFrame = (wxLogFrame *)NULL;

 }
 
 wxLogWindow::~wxLogWindow()
 {
 }
 
 wxLogWindow::~wxLogWindow()
 {

+  delete m_pOldLog;
+

   // may be NULL if log frame already auto destroyed itself
   delete m_pLogFrame;
 }
 
   // may be NULL if log frame already auto destroyed itself
   delete m_pLogFrame;
 }
 

-#endif  //WX_TEST_MINIMAL
+#endif  //wxUSE_NOGUI

 
 // ============================================================================
 // Global functions/variables
 
 // ============================================================================
 // Global functions/variables


@@ -797,6 +848,7 @@ wxLogWindow::~wxLogWindow()
 // static variables
 // ----------------------------------------------------------------------------
 wxLog      *wxLog::ms_pLogger      = (wxLog *) NULL;
 // static variables
 // ----------------------------------------------------------------------------
 wxLog      *wxLog::ms_pLogger      = (wxLog *) NULL;

+bool        wxLog::ms_doLog        = TRUE;

 bool        wxLog::ms_bAutoCreate  = TRUE;
 wxTraceMask wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 
 bool        wxLog::ms_bAutoCreate  = TRUE;
 wxTraceMask wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 


@@ -910,6 +962,12 @@ void Trap()
     DebugBreak();
   #elif defined(__WXSTUBS__)
     // TODO
     DebugBreak();
   #elif defined(__WXSTUBS__)
     // TODO

+  #elif defined(__WXMAC__)
+  #if __powerc
+    Debugger();
+  #else
+    SysBreak();
+  #endif

   #else // Unix
     raise(SIGTRAP);
   #endif // Win/Unix
   #else // Unix
     raise(SIGTRAP);
   #endif // Win/Unix


@@ -925,12 +983,23 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
   if ( s_bInAssert ) {
     // He-e-e-e-elp!! we're trapped in endless loop
     Trap();
   if ( s_bInAssert ) {
     // He-e-e-e-elp!! we're trapped in endless loop
     Trap();

+
+    return;

   }
 
   s_bInAssert = TRUE;
 
   char szBuf[LOG_BUFFER_SIZE];
   }
 
   s_bInAssert = TRUE;
 
   char szBuf[LOG_BUFFER_SIZE];

-  sprintf(szBuf, _("Assert failed in file %s at line %d"), szFile, nLine);
+
+  // make life easier for people using VC++ IDE: clicking on the message will
+  // take us immediately to the place of the failed assert
+#ifdef __VISUALC__
+  sprintf(szBuf, "%s(%d): assert failed", szFile, nLine);
+#else  // !VC++
+  // make the error message more clear for all the others
+  sprintf(szBuf, "Assert failed in file %s at line %d", szFile, nLine);
+#endif // VC/!VC
+

   if ( szMsg != NULL ) {
     strcat(szBuf, ": ");
     strcat(szBuf, szMsg);
   if ( szMsg != NULL ) {
     strcat(szBuf, ": ");
     strcat(szBuf, szMsg);


@@ -943,22 +1012,26 @@ void wxOnAssert(const char *szFile, int nLine, const char *szMsg)
     // send it to the normal log destination
     wxLogDebug(szBuf);
 
     // send it to the normal log destination
     wxLogDebug(szBuf);
 

-    strcat(szBuf, _("\nDo you want to stop the program?"
+    #if wxUSE_NOGUI
+      Trap();
+    #else
+      strcat(szBuf, "\nDo you want to stop the program?"

                     "\nYou can also choose [Cancel] to suppress "
                     "\nYou can also choose [Cancel] to suppress "

-                    "further warnings."));
+                    "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;
   }
 
   s_bInAssert = FALSE;