corrected DoReadLong

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 3731fe3865ddd359e3efa8abe4e2134792e7ee71..3dfb000b32b58a3ba58af98edea09a7056733798 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -60,6 +60,10 @@
   #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString
 #endif
 
+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+
 // ----------------------------------------------------------------------------
 // non member functions
 // ----------------------------------------------------------------------------
@@ -418,7 +422,10 @@ wxLogStderr::wxLogStderr(FILE *fp)
         m_fp = fp;
 }
 
-#if defined(__WXMAC__) && !defined(__DARWIN__)
+#if defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ > 0x5300)
+
+#if !TARGET_API_MAC_CARBON
+// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
 
 #ifndef __MetroNubUtils__
 #include "MetroNubUtils.h"
@@ -601,7 +608,9 @@ OSErr ClearWatchPoint (WatchPointIDT watchPointID)
        }
 #endif
 
-#endif
+#endif // !TARGET_API_MAC_CARBON
+
+#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ > 0x5300)
 
 void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
@@ -627,11 +636,15 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 
     Boolean running = false ;
 
+#if !TARGET_API_MAC_CARBON && (__MWERKS__ > 0x5300)
+
     if ( IsMWDebuggerRunning() && AmIBeingMWDebugged() )
     {
         running = true ;
     }
 
+#endif
+
     if (running)
     {
 #ifdef __powerc