Reinsert missing ctor removed in date/time tidy

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 8c5c23be291f1892ddf716086b927d127ea803f4..02b83693bfc8bbc3f2dfc6ed0fdff2b76a8b616d 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -65,6 +65,11 @@
   #include  "wx/mac/private.h"  // includes mac headers
 #endif
 
   #include  "wx/mac/private.h"  // includes mac headers
 #endif
 

+#if defined(__MWERKS__) && wxUSE_UNICODE
+    #include <wtime.h>
+#endif
+
+

 // ----------------------------------------------------------------------------
 // non member functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // non member functions
 // ----------------------------------------------------------------------------


@@ -351,7 +356,6 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
 
 wxLog::wxLog()
 {
 
 wxLog::wxLog()
 {

-    m_bHasMessages = FALSE;

 }
 
 wxChar *wxLog::SetLogBuffer( wxChar *buf, size_t size)
 }
 
 wxChar *wxLog::SetLogBuffer( wxChar *buf, size_t size)


@@ -493,8 +497,7 @@ void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t))
 
 void wxLog::Flush()
 {
 
 void wxLog::Flush()
 {

-    // remember that we don't have any more messages to show
-    m_bHasMessages = FALSE;
+    // nothing to do here

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -706,16 +709,21 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
     fflush(m_fp);
 
     // under Windows, programs usually don't have stderr at all, so show the
     fflush(m_fp);
 
     // under Windows, programs usually don't have stderr at all, so show the

-    // messages also under debugger - unless it's a console program
+    // messages also under debugger (unless it's a console program which does
+    // have stderr or unless this is a file logger which doesn't use stderr at
+    // all)

 #if defined(__WXMSW__) && wxUSE_GUI && !defined(__WXMICROWIN__)
 #if defined(__WXMSW__) && wxUSE_GUI && !defined(__WXMICROWIN__)

-    str += wxT("\r\n") ;
-    OutputDebugString(str.c_str());
+    if ( m_fp == stderr )
+    {
+        str += wxT("\r\n") ;
+        OutputDebugString(str.c_str());
+    }

 #endif // MSW
 #endif // MSW

+

 #if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI
     Str255 pstr ;
 #if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI
     Str255 pstr ;

-    strcpy( (char*) pstr , str.c_str() ) ;
-    strcat( (char*) pstr , ";g" ) ;
-    c2pstr( (char*) pstr ) ;
+    wxString output = str + wxT(";g") ;
+    wxMacStringToPascal( output.c_str() , pstr ) ;

 
     Boolean running = false ;
 
 
     Boolean running = false ;
 


@@ -744,6 +752,7 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM

+#include "wx/ioswrap.h"

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


@@ -793,7 +802,7 @@ void wxLogChain::Flush()
     if ( m_logOld )
         m_logOld->Flush();
 
     if ( m_logOld )
         m_logOld->Flush();
 

-    // be careful to avoid inifinite recursion
+    // be careful to avoid infinite recursion

     if ( m_logNew && m_logNew != this )
         m_logNew->Flush();
 }
     if ( m_logNew && m_logNew != this )
         m_logNew->Flush();
 }