Additional makefiles; changes for compilation with BC++ and GnuWin32

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 5c9e5f33866b30f6eced018249558a331b6dfd03..6af8892fcd8bdb77356f2fdc54008922661fb26d 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -140,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;
   }
 }
 
@@ -265,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;
@@ -423,7 +423,7 @@ void wxLogGui::Flush()
 
   // 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)
@@ -633,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;
@@ -723,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)
@@ -778,7 +778,7 @@ void wxLogWindow::OnFrameCreate(wxFrame *frame)
 
 void wxLogWindow::OnFrameDelete(wxFrame *frame)
 {
-  m_pLogFrame = NULL;
+  m_pLogFrame = (wxLogFrame *) NULL;
 }
 
 wxLogWindow::~wxLogWindow()
@@ -796,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;