fixed 64but bug with g_strEmpty initialization

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index e1840f24ad064b1372915710b15f1f3385ae3c1c..6a1848932c0e2dbe112e6de3f64919f4fcaa4810 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);
     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;
 }
 
   return ms_pLogger;
 }
 

-wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
+wxLog *wxLog::SetActiveTarget(wxLog *pLogger, bool bNoFlashOld)

 {
   // flush the old messages before changing
 {
   // flush the old messages before changing

-  if ( ms_pLogger != NULL )
+  if ( (ms_pLogger != NULL) && !bNoFlashOld )

     ms_pLogger->Flush();
 
   wxLog *pOldLogger = ms_pLogger;
     ms_pLogger->Flush();
 
   wxLog *pOldLogger = ms_pLogger;


@@ -423,18 +423,18 @@ 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)
   wxString str;
   // @@@ 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
        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)
     // 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;
 
 
     nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
 


@@ -633,7 +633,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 +723,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)


@@ -772,13 +772,13 @@ 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()


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

-wxLog      *wxLog::ms_pLogger      = NULL;
+wxLog      *wxLog::ms_pLogger      = (wxLog *) NULL;

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