X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6b6267d320a02bfa4baef63916824ed4f5caf9ab..ce16e5d78fad60b6bbc6ef8889a663fd1c9f23d2:/src/common/log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index e7669a12e9..97f406c81f 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -50,6 +50,8 @@
 #include  "wx/log.h"
 #include  "wx/thread.h"
 
+#if wxUSE_LOG
+
 // other standard headers
 #include  <errno.h>
 #include  <stdlib.h>
@@ -272,13 +274,7 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
 wxLog::wxLog()
 {
     m_bHasMessages = FALSE;
-
-    // enable verbose messages by default in the debug builds
-#ifdef __WXDEBUG__
-    m_bVerbose = TRUE;
-#else // release
     m_bVerbose = FALSE;
-#endif // debug/release
 }
 
 wxLog *wxLog::GetActiveTarget()
@@ -402,7 +398,7 @@ wxLogStderr::wxLogStderr(FILE *fp)
         m_fp = fp;
 }
 
-#if defined(__WXMAC__) 
+#if defined(__WXMAC__) && !defined(__UNIX__)
 #define kDebuggerSignature		'MWDB'
 
 static Boolean FindProcessBySignature(OSType signature, ProcessInfoRec* info)
@@ -498,7 +494,7 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
     str += wxT("\r\n") ;
     OutputDebugString(str.c_str());
 #endif // MSW
-#if defined(__WXMAC__) && wxUSE_GUI
+#if defined(__WXMAC__) && !defined(__WXMAC_X__) && wxUSE_GUI
 	Str255 pstr ;
 	strcpy( (char*) pstr , str.c_str() ) ;
 	strcat( (char*) pstr , ";g" ) ;
@@ -529,7 +525,7 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 		DebugStr(pstr);
 	#endif
 	}
-#endif // MSW
+#endif // Mac
 }
 
 // ----------------------------------------------------------------------------
@@ -547,7 +543,9 @@ wxLogStream::wxLogStream(ostream *ostr)
 
 void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
-    (*m_ostr) << wxConvertWX2MB(szString) << endl;
+    wxString str;
+    TimeStamp(&str);
+    (*m_ostr) << str << wxConvertWX2MB(szString) << endl;
 }
 #endif // wxUSE_STD_IOSTREAM
 
@@ -790,3 +788,4 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 
 #endif  //WXDEBUG
 
+#endif //wxUSE_LOG