made wxTextFile work in Unicode; also made it possible to use it with non seekable...

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index e8b718f05f4b89323f108cc0f358bbce2b123b71..252c6b09bbf73b1594380a44763e8ba0453f5796 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "log.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -550,7 +546,8 @@ void wxLogBuffer::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
                 TimeStamp(&str);
                 str += szString;
 
                 TimeStamp(&str);
                 str += szString;
 

-                wxMessageOutputDebug().Printf(_T("%s\n"), str.c_str());
+                wxMessageOutputDebug dbgout;
+                dbgout.Printf(_T("%s\n"), str.c_str());

             }
 #endif // __WXDEBUG__
             break;
             }
 #endif // __WXDEBUG__
             break;


@@ -620,7 +617,7 @@ void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     wxString str;
     TimeStamp(&str);
 {
     wxString str;
     TimeStamp(&str);

-    (*m_ostr) << str << wxConvertWX2MB(szString) << wxSTD endl;
+    (*m_ostr) << wxConvertWX2MB(str) << wxConvertWX2MB(szString) << wxSTD endl;

 }
 #endif // wxUSE_STD_IOSTREAM
 
 }
 #endif // wxUSE_STD_IOSTREAM
 


@@ -794,14 +791,15 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
         // if this happens, something is seriously wrong, so don't use _() here
         // for safety
         wxSprintf(s_szBuf, _T("unknown error %lx"), nErrCode);
         // if this happens, something is seriously wrong, so don't use _() here
         // for safety
         wxSprintf(s_szBuf, _T("unknown error %lx"), nErrCode);

-               return s_szBuf;
+        return s_szBuf;

     }
 
 
     // copy it to our buffer and free memory
     // Crashes on SmartPhone (FIXME)
 #if !defined(__SMARTPHONE__) /* of WinCE */
     }
 
 
     // copy it to our buffer and free memory
     // Crashes on SmartPhone (FIXME)
 #if !defined(__SMARTPHONE__) /* of WinCE */

-     if( lpMsgBuf != 0 ) {
+    if( lpMsgBuf != 0 )
+    {

         wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
         s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
 
         wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
         s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');