X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5a20d2ced0a0779b5d8b1cc8064f8404b2727e92..3ef595d5f879ec3ed4ef511445487261304313e2:/src/common/log.cpp?ds=sidebyside

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 113d202158..89ed1264fc 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -42,7 +42,7 @@
 #include "wx/msgout.h"
 #include "wx/textfile.h"
 #include "wx/thread.h"
-#include "wx/wxchar.h"
+#include "wx/crt.h"
 
 // other standard headers
 #ifndef __WXWINCE__
@@ -157,7 +157,7 @@ IMPLEMENT_LOG_FUNCTION(Status)
 void wxSafeShowMessage(const wxString& title, const wxString& text)
 {
 #ifdef __WINDOWS__
-    ::MessageBox(NULL, text, title, MB_OK | MB_ICONSTOP);
+    ::MessageBox(NULL, text.wx_str(), title.wx_str(), MB_OK | MB_ICONSTOP);
 #else
     wxFprintf(stderr, _T("%s: %s\n"), title.c_str(), text.c_str());
     fflush(stderr);
@@ -527,6 +527,22 @@ wxChar *wxLog::SetLogBuffer(wxChar * WXUNUSED(buf), size_t WXUNUSED(size))
 
 #endif // WXWIN_COMPATIBILITY_2_6
 
+#if WXWIN_COMPATIBILITY_2_8
+
+void wxLog::DoLog(wxLogLevel WXUNUSED(level),
+                  const char *WXUNUSED(szString),
+                  time_t WXUNUSED(t))
+{
+}
+
+void wxLog::DoLog(wxLogLevel WXUNUSED(level),
+                  const wchar_t *WXUNUSED(wzString),
+                  time_t WXUNUSED(t))
+{
+}
+
+#endif // WXWIN_COMPATIBILITY_2_8
+
 wxLog *wxLog::GetActiveTarget()
 {
     if ( ms_bAutoCreate && ms_pLogger == NULL ) {
@@ -595,7 +611,7 @@ void wxLog::ClearTraceMasks()
 void wxLog::TimeStamp(wxString *str)
 {
 #if wxUSE_DATETIME
-    if ( ms_timestamp )
+    if ( !ms_timestamp.empty() )
     {
         wxChar buf[256];
         time_t timeNow;
@@ -849,18 +865,28 @@ void wxLogChain::DoLog(wxLogLevel level, const wxString& szString, time_t t)
     }
 }
 
-// ----------------------------------------------------------------------------
-// wxLogPassThrough
-// ----------------------------------------------------------------------------
-
 #ifdef __VISUALC__
     // "'this' : used in base member initializer list" - so what?
     #pragma warning(disable:4355)
 #endif // VC++
 
-wxLogPassThrough::wxLogPassThrough()
+// ----------------------------------------------------------------------------
+// wxLogInterposer
+// ----------------------------------------------------------------------------
+
+wxLogInterposer::wxLogInterposer()
+                : wxLogChain(this)
+{
+}
+
+// ----------------------------------------------------------------------------
+// wxLogInterposerTemp
+// ----------------------------------------------------------------------------
+
+wxLogInterposerTemp::wxLogInterposerTemp()
                 : wxLogChain(this)
 {
+	DetachOldLog();
 }
 
 #ifdef __VISUALC__
@@ -890,7 +916,7 @@ wxLogLevel      wxLog::ms_logLevel     = wxLOG_Max;  // log everything by defaul
 
 size_t          wxLog::ms_suspendCount = 0;
 
-const wxChar   *wxLog::ms_timestamp    = wxT("%X");  // time only, no date
+wxString        wxLog::ms_timestamp(wxT("%X"));  // time only, no date
 
 wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 wxArrayString   wxLog::ms_aTraceMasks;