X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d509295ee43d8b26096dd068eb04993fe7ab4d8..c8b204e6fd541515bead44e1be86ab8cb44a35d3:/src/generic/logg.cpp?ds=sidebyside

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index fcfe1afc43..a0ff4d3672 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -44,6 +44,7 @@
     #include "wx/sizer.h"
     #include "wx/statbmp.h"
     #include "wx/button.h"
+    #include "wx/settings.h"
 #endif // WX_PRECOMP
 
 #if wxUSE_LOGGUI || wxUSE_LOGWINDOW
@@ -1075,7 +1076,7 @@ void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
     wxString msg;
     TimeStamp(&msg);
 
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__DARWIN__)
     // 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');