From 925ee99f1098ccd6572444d446050eb599c42815 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Thu, 10 Jan 2002 21:09:29 +0000 Subject: [PATCH] disable MetroNub stuff for CodeWarrior 5.3 Carbon builds git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13491 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/log.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/common/log.cpp b/src/common/log.cpp index c9c4ab2776..aef1e7f396 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -424,6 +424,9 @@ wxLogStderr::wxLogStderr(FILE *fp) #if defined(__WXMAC__) && !defined(__DARWIN__) +#if !TARGET_API_MAC_CARBON || (__MSL_CPP__ > 0x5300) +// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds... + #ifndef __MetroNubUtils__ #include "MetroNubUtils.h" #endif @@ -605,7 +608,9 @@ OSErr ClearWatchPoint (WatchPointIDT watchPointID) } #endif -#endif +#endif // !TARGET_API_MAC_CARBON || (__MSL_CPP__ > 0x5300) + +#endif // defined(__WXMAC__) && !defined(__DARWIN__) void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) { @@ -631,11 +636,15 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) Boolean running = false ; +#if !TARGET_API_MAC_CARBON || (__MSL_CPP__ > 0x5300) + if ( IsMWDebuggerRunning() && AmIBeingMWDebugged() ) { running = true ; } +#endif + if (running) { #ifdef __powerc -- 2.45.2