Changed the "delete win" to the more proper "win->Destroy()" in

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 5c9e5f33866b30f6eced018249558a331b6dfd03..52e44a77e182b1828c3a00529350481d896bd714 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -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


@@ -140,7 +142,7 @@ void wxLogStatus(wxFrame *pFrame, const char *szFormat, ...)
     wxASSERT( gs_pFrame == NULL ); // should be reset!
     gs_pFrame = pFrame;
     wxLog::OnLog(wxLOG_Status, s_szBuf);
     wxASSERT( gs_pFrame == NULL ); // should be reset!
     gs_pFrame = pFrame;
     wxLog::OnLog(wxLOG_Status, s_szBuf);

-    gs_pFrame = NULL;
+    gs_pFrame = (wxFrame *) NULL;

   }
 }
 
   }
 }
 


@@ -250,14 +252,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?
     }
   }


@@ -267,12 +273,15 @@ wxLog *wxLog::GetActiveTarget()
 
 wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
 {
 
 wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
 {

-  // flush the old messages before changing
-  if ( ms_pLogger != NULL )
+  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 +289,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 +303,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;
 }


@@ -329,8 +342,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;


@@ -386,6 +402,7 @@ void wxLogStream::DoLogString(const char *szString)
   (*m_ostr) << szString << endl << flush;
 }
 
   (*m_ostr) << szString << endl << flush;
 }
 

+#ifndef   wxUSE_NOGUI

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


@@ -409,8 +426,6 @@ wxLogTextCtrl::~wxLogTextCtrl()
 // wxLogGui implementation
 // ----------------------------------------------------------------------------
 
 // wxLogGui implementation
 // ----------------------------------------------------------------------------
 

-#ifndef   WX_TEST_MINIMAL
-

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


@@ -423,7 +438,7 @@ void wxLogGui::Flush()
 
   // do it right now to block any new calls to Flush() while we're here
   m_bHasMessages = FALSE;
 
   // do it right now to block any new calls to Flush() while we're here
   m_bHasMessages = FALSE;

-  
+

   // @@@ ugly...
 
   // concatenate all strings (but not too many to not overfill the msg box)
   // @@@ ugly...
 
   // concatenate all strings (but not too many to not overfill the msg box)


@@ -492,18 +507,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;


@@ -633,7 +652,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
   // open file
   // ---------
   wxFile file;
   // open file
   // ---------
   wxFile file;

-  bool bOk = FALSE; 
+  bool bOk = FALSE;

   if ( wxFile::Exists(szFileName) ) {
     bool bAppend = FALSE;
     wxString strMsg;
   if ( wxFile::Exists(szFileName) ) {
     bool bAppend = FALSE;
     wxString strMsg;


@@ -723,7 +742,7 @@ void wxLogWindow::Flush()
   if ( m_pOldLog != NULL )
     m_pOldLog->Flush();
 
   if ( m_pOldLog != NULL )
     m_pOldLog->Flush();
 

-  m_bHasMessages = FALSE; 
+  m_bHasMessages = FALSE;

 }
 
 void wxLogWindow::DoLog(wxLogLevel level, const char *szString)
 }
 
 void wxLogWindow::DoLog(wxLogLevel level, const char *szString)


@@ -737,13 +756,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 +798,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 +806,24 @@ wxFrame *wxLogWindow::GetFrame() const
   return m_pLogFrame;
 }
 
   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 = 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


@@ -796,7 +832,8 @@ wxLogWindow::~wxLogWindow()
 // ----------------------------------------------------------------------------
 // static variables
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // static variables
 // ----------------------------------------------------------------------------

-wxLog      *wxLog::ms_pLogger      = NULL;
+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;
 


@@ -925,6 +962,8 @@ 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;
   }
 
   s_bInAssert = TRUE;


@@ -943,22 +982,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?"
-                    "\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;
   }
 
   s_bInAssert = FALSE;