prefix symbols with wx_ to reduce risk of collision

[wxWidgets.git] / src / generic / logg.cpp

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index ca78f51f9e80861a245c78d917cba90e985a4ef7..eb5e17745cf06451b174dcd27fcccec8343439a6 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -1111,7 +1111,7 @@ static int OpenLogFile(wxFile& file, wxString *pFilename)
 
     // open file
     // ---------
-    bool bOk = FALSE;
+    bool bOk;
     if ( wxFile::Exists(filename) ) {
         bool bAppend = FALSE;
         wxString strMsg;
@@ -1171,14 +1171,7 @@ void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
     wxString msg;
     TimeStamp(&msg);
 
-#if defined(__WXMAC__)
-    // VZ: this is a bug in wxMac, it *must* accept '\n' as new line, the
-    //     translation must be done in wxTextCtrl, not here! (FIXME)
-    msg << szString << wxT('\r');
-#else
     msg << szString << wxT('\n');
-#endif
-
     m_pTextCtrl->AppendText(msg);
 }