X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b76b015ed9231ffe128ddba9fb35e37b4be9764d..99397a94d0084648c96c3195e73feb64821ed305:/src/common/log.cpp

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 4f855381f4..837956d26a 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -178,9 +178,23 @@ void wxLogVerbose(const wxChar *szFormat, ...)
     if ( pLog != NULL && wxLog::IsAllowedTraceMask(mask) ) {
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
+      wxChar *p = s_szBuf;
+      size_t len = WXSIZEOF(s_szBuf);
+      wxStrncpy(s_szBuf, _T("("), len);
+      len -= 1; // strlen("(")
+      p += 1;
+      wxStrncat(p, mask, len);
+      size_t lenMask = wxStrlen(mask);
+      len -= lenMask;
+      p += lenMask;
+
+      wxStrncat(p, _T(") "), len);
+      len -= 2;
+      p += 2;
+
       va_list argptr;
       va_start(argptr, szFormat);
-      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+      wxVsnprintf(p, len, szFormat, argptr);
       va_end(argptr);
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
@@ -355,8 +369,13 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
         case wxLOG_Trace:
         case wxLOG_Debug:
 #ifdef __WXDEBUG__
-            DoLogString(szString, t);
-#endif
+            {
+                wxString msg = level == wxLOG_Trace ? wxT("Trace: ")
+                                                    : wxT("Debug: ");
+                msg << szString;
+                DoLogString(msg, t);
+            }
+#endif // Debug
             break;
     }
 }
@@ -383,6 +402,86 @@ wxLogStderr::wxLogStderr(FILE *fp)
         m_fp = fp;
 }
 
+#if defined(__WXMAC__) 
+#define kDebuggerSignature		'MWDB'
+
+static Boolean FindProcessBySignature(OSType signature, ProcessInfoRec* info)
+{	
+	OSErr err;
+	ProcessSerialNumber psn;
+	Boolean found = false;
+	psn.highLongOfPSN = 0;
+	psn.lowLongOfPSN = kNoProcess;
+	
+	if (!info) return false;
+	
+	info->processInfoLength = sizeof(ProcessInfoRec);
+	info->processName = NULL;
+	info->processAppSpec = NULL;
+	
+	err = noErr;
+	while (!found && err == noErr)
+	{
+		err = GetNextProcess(&psn);
+		if (err == noErr)
+		{
+			err = GetProcessInformation(&psn, info);
+			found = err == noErr && info->processSignature == signature;
+		}
+	}				
+	return found;
+}
+
+pascal Boolean MWDebuggerIsRunning(void)
+{
+	ProcessInfoRec info;
+	return FindProcessBySignature(kDebuggerSignature, &info);
+}
+
+pascal OSErr AmIBeingMWDebugged(Boolean* result)
+{
+	OSErr err;
+	ProcessSerialNumber psn;
+	OSType sig = kDebuggerSignature;
+	AppleEvent	theAE = {typeNull, NULL};
+	AppleEvent	theReply = {typeNull, NULL};
+	AEAddressDesc addr  = {typeNull, NULL};
+	DescType actualType;
+	Size actualSize;
+	
+	if (!result) return paramErr;
+	
+	err = AECreateDesc(typeApplSignature, &sig, sizeof(sig), &addr);
+	if (err != noErr) goto exit;
+	
+	err = AECreateAppleEvent('MWDB', 'Dbg?', &addr,
+				kAutoGenerateReturnID, kAnyTransactionID, &theAE);
+	if (err != noErr) goto exit;
+		
+	GetCurrentProcess(&psn);
+	err = AEPutParamPtr(&theAE, keyDirectObject, typeProcessSerialNumber,
+			&psn, sizeof(psn));
+	if (err != noErr) goto exit;
+	
+	err = AESend(&theAE, &theReply, kAEWaitReply, kAENormalPriority,
+					kAEDefaultTimeout, NULL, NULL);
+	if (err != noErr) goto exit;
+	
+	err = AEGetParamPtr(&theReply, keyAEResult, typeBoolean, &actualType, result, 
+				sizeof(Boolean), &actualSize);
+
+exit:
+	if (addr.dataHandle)
+		AEDisposeDesc(&addr);
+	if (theAE.dataHandle)
+		AEDisposeDesc(&theAE);
+	if (theReply.dataHandle)
+		AEDisposeDesc(&theReply);
+
+	return err;
+}
+#endif
+
 void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     wxString str;
@@ -396,7 +495,40 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
     // under Windows, programs usually don't have stderr at all, so show the
     // messages also under debugger - unless it's a console program
 #if defined(__WXMSW__) && wxUSE_GUI
-    OutputDebugString(str + wxT("\r\n"));
+    str += wxT("\r\n") ;
+    OutputDebugString(str.c_str());
+#endif // MSW
+#if defined(__WXMAC__) && wxUSE_GUI
+	Str255 pstr ;
+	strcpy( (char*) pstr , str.c_str() ) ;
+	strcat( (char*) pstr , ";g" ) ;
+	c2pstr( (char*) pstr ) ;
+#if __WXDEBUG__
+	Boolean running = false ;
+	
+/*
+	if ( MWDebuggerIsRunning() )
+	{
+		AmIBeingMWDebugged( &running ) ;
+	}
+*/
+	if (running)
+	{
+	#ifdef __powerc
+		DebugStr(pstr);
+	#else
+		SysBreakStr(pstr);
+	#endif
+	}
+	else		
+#endif
+	{
+	#ifdef __powerc
+		DebugStr(pstr);
+	#else
+		DebugStr(pstr);
+	#endif
+	}
 #endif // MSW
 }
 
@@ -431,7 +563,13 @@ wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;
 bool            wxLog::ms_doLog        = TRUE;
 bool            wxLog::ms_bAutoCreate  = TRUE;
 
-const wxChar   *wxLog::ms_timestamp    = wxT("%X");  // time only, no date
+size_t          wxLog::ms_suspendCount = 0;
+
+#if wxUSE_GUI
+    const wxChar *wxLog::ms_timestamp  = wxT("%X");  // time only, no date
+#else
+    const wxChar *wxLog::ms_timestamp  = NULL;       // save space
+#endif
 
 wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 wxArrayString   wxLog::ms_aTraceMasks;
@@ -535,7 +673,7 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
     wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);
     return s_szBuf;
 #else
-    return strerror(nErrCode);
+    return strerror((int)nErrCode);
 #endif
 #endif  // Win/Unix
 }
@@ -610,12 +748,10 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 #if wxUSE_GUI || defined(__WXMSW__)
         // this message is intentionally not translated - it is for
         // developpers only
-        wxStrcat(szBuf, wxT("\nDo you want to stop the program?"
-                            "\nYou can also choose [Cancel] to suppress "
-                            "further warnings."));
+        wxStrcat(szBuf, wxT("\nDo you want to stop the program?\nYou can also choose [Cancel] to suppress further warnings."));
 
 #if wxUSE_GUI
-        switch ( wxMessageBox(szBuf, "Debug",
+        switch ( wxMessageBox(szBuf, wxT("Debug"),
                               wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
             case wxYES:
                 Trap();
@@ -628,7 +764,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
             //case wxNO: nothing to do
         }
 #else // !GUI, but MSW
-        switch ( ::MessageBox(NULL, szBuf, "Debug",
+        switch ( ::MessageBox(NULL, szBuf, _T("Debug"),
                               MB_YESNOCANCEL | MB_ICONSTOP ) ) {
             case IDYES:
                 Trap();