* Fixed a bug in notebook.tex

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index d23a3e1c8f070d82eee733ccd2b2d7f5754141f9..6a1848932c0e2dbe112e6de3f64919f4fcaa4810 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -33,6 +33,7 @@
   #include  <wx/string.h>
   #include  <wx/intl.h>
   #include  <wx/menu.h>
+  #include  <wx/frame.h>
 
   #include  <wx/generic/msgdlgg.h>
   #include  <wx/filedlg.h>
@@ -139,7 +140,7 @@ void wxLogStatus(wxFrame *pFrame, const char *szFormat, ...)
     wxASSERT( gs_pFrame == NULL ); // should be reset!
     gs_pFrame = pFrame;
     wxLog::OnLog(wxLOG_Status, s_szBuf);
-    gs_pFrame = NULL;
+    gs_pFrame = (wxFrame *) NULL;
   }
 }
 
@@ -264,10 +265,10 @@ wxLog *wxLog::GetActiveTarget()
   return ms_pLogger;
 }
 
-wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
+wxLog *wxLog::SetActiveTarget(wxLog *pLogger, bool bNoFlashOld)
 {
   // flush the old messages before changing
-  if ( ms_pLogger != NULL )
+  if ( (ms_pLogger != NULL) && !bNoFlashOld )
     ms_pLogger->Flush();
 
   wxLog *pOldLogger = ms_pLogger;
@@ -420,17 +421,20 @@ void wxLogGui::Flush()
   if ( !m_bHasMessages )
     return;
 
+  // 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)
   wxString str;
-  uint nLines    = 0,
+  size_t nLines    = 0,
        nMsgCount = m_aMessages.Count();
 
   // start from the most recent message
-  for ( uint n = nMsgCount; n > 0; n-- ) {
+  for ( size_t n = nMsgCount; n > 0; n-- ) {
     // for Windows strings longer than this value are wrapped (NT 4.0)
-    const uint nMsgLineWidth = 156;
+    const size_t nMsgLineWidth = 156;
 
     nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
 
@@ -448,7 +452,6 @@ void wxLogGui::Flush()
   }
 
   // no undisplayed messages whatsoever
-  m_bHasMessages =
   m_bErrors      = FALSE;
   m_aMessages.Empty();
 }
@@ -489,7 +492,7 @@ void wxLogGui::DoLog(wxLogLevel level, const char *szString)
         {
           wxString strTime = TimeStamp();
 
-          #ifdef  __WIN32__
+          #if defined(__WIN32__) && !defined(__WXSTUBS__)
               // don't prepend debug/trace here: it goes to the debug window
               // anyhow, but do put a timestamp
               OutputDebugString(strTime + szString + "\n\r");
@@ -630,7 +633,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
   // open file
   // ---------
   wxFile file;
-  bool bOk = FALSE; 
+  bool bOk = FALSE;
   if ( wxFile::Exists(szFileName) ) {
     bool bAppend = FALSE;
     wxString strMsg;
@@ -720,7 +723,7 @@ void wxLogWindow::Flush()
   if ( m_pOldLog != NULL )
     m_pOldLog->Flush();
 
-  m_bHasMessages = FALSE; 
+  m_bHasMessages = FALSE;
 }
 
 void wxLogWindow::DoLog(wxLogLevel level, const char *szString)
@@ -769,13 +772,13 @@ wxFrame *wxLogWindow::GetFrame() const
   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()
@@ -793,7 +796,7 @@ wxLogWindow::~wxLogWindow()
 // ----------------------------------------------------------------------------
 // static variables
 // ----------------------------------------------------------------------------
-wxLog      *wxLog::ms_pLogger      = NULL;
+wxLog      *wxLog::ms_pLogger      = (wxLog *) NULL;
 bool        wxLog::ms_bAutoCreate  = TRUE;
 wxTraceMask wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 
@@ -905,6 +908,8 @@ void Trap()
 {
   #ifdef __WXMSW__
     DebugBreak();
+  #elif defined(__WXSTUBS__)
+    // TODO
   #else // Unix
     raise(SIGTRAP);
   #endif // Win/Unix