// Created: 29/01/98
// RCS-ID: $Id$
// Copyright: (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
#if wxUSE_GUI
#include "wx/window.h"
+ #include "wx/msgdlg.h"
#ifdef __WXMSW__
#include "wx/msw/private.h"
#endif
- #include "wx/msgdlg.h"
#endif
#endif //WX_PRECOMP
#include "wx/utils.h"
#include "wx/wxchar.h"
#include "wx/log.h"
+#include "wx/thread.h"
+
+#if wxUSE_LOG
// other standard headers
#include <errno.h>
#include <stdlib.h>
#include <time.h>
-#ifdef __WXMSW__
- #include <windows.h>
- // Redefines OutputDebugString if necessary
- #include "wx/msw/private.h"
-#else //Unix
- #include <signal.h>
-#endif //Win/Unix
+#if defined(__WXMSW__)
+ #include "wx/msw/private.h" // includes windows.h for OutputDebugString
+#endif
+
+#if defined(__WXMAC__)
+ #include "wx/mac/private.h" // includes mac headers
+#endif
+
+#if defined(__MWERKS__) && wxUSE_UNICODE
+ #include <wtime.h>
+#endif
+
// ----------------------------------------------------------------------------
// non member functions
// ============================================================================
// ----------------------------------------------------------------------------
-// implementation of Log functions
-//
-// NB: unfortunately we need all these distinct functions, we can't make them
-// macros and not all compilers inline vararg functions.
+// globals
// ----------------------------------------------------------------------------
// log functions can't allocate memory (LogError("out of memory...") should
// work!), so we use a static buffer for all log messages
#define LOG_BUFFER_SIZE (4096)
-// static buffer for error messages (FIXME MT-unsafe)
-static wxChar s_szBuf[LOG_BUFFER_SIZE];
+// static buffer for error messages
+static wxChar s_szBufStatic[LOG_BUFFER_SIZE];
+
+static wxChar *s_szBuf = s_szBufStatic;
+static size_t s_szBufSize = WXSIZEOF( s_szBufStatic );
+
+#if wxUSE_THREADS
+
+// the critical section protecting the static buffer
+static wxCriticalSection gs_csLogBuf;
+
+#endif // wxUSE_THREADS
+
+// return true if we have a non NULL non disabled log target
+static inline bool IsLoggingEnabled()
+{
+ return wxLog::IsEnabled() && (wxLog::GetActiveTarget() != NULL);
+}
+
+// ----------------------------------------------------------------------------
+// implementation of Log functions
+//
+// NB: unfortunately we need all these distinct functions, we can't make them
+// macros and not all compilers inline vararg functions.
+// ----------------------------------------------------------------------------
// generic log function
+void wxVLogGeneric(wxLogLevel level, const wxChar *szFormat, va_list argptr)
+{
+ if ( IsLoggingEnabled() ) {
+ wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+ wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+
+ wxLog::OnLog(level, s_szBuf, time(NULL));
+ }
+}
+
void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
{
- if ( wxLog::GetActiveTarget() != NULL ) {
va_list argptr;
va_start(argptr, szFormat);
- wxVsprintf(s_szBuf, szFormat, argptr);
+ wxVLogGeneric(level, szFormat, argptr);
va_end(argptr);
-
- wxLog::OnLog(level, s_szBuf, time(NULL));
- }
}
-#define IMPLEMENT_LOG_FUNCTION(level) \
- void wxLog##level(const wxChar *szFormat, ...) \
- { \
- if ( wxLog::GetActiveTarget() != NULL ) { \
- va_list argptr; \
- va_start(argptr, szFormat); \
- wxVsprintf(s_szBuf, szFormat, argptr); \
- va_end(argptr); \
- \
- wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \
- } \
+#define IMPLEMENT_LOG_FUNCTION(level) \
+ void wxVLog##level(const wxChar *szFormat, va_list argptr) \
+ { \
+ if ( IsLoggingEnabled() ) { \
+ wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); \
+ \
+ wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr); \
+ \
+ wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \
+ } \
+ } \
+ void wxLog##level(const wxChar *szFormat, ...) \
+ { \
+ va_list argptr; \
+ va_start(argptr, szFormat); \
+ wxVLog##level(szFormat, argptr); \
+ va_end(argptr); \
}
-IMPLEMENT_LOG_FUNCTION(FatalError)
IMPLEMENT_LOG_FUNCTION(Error)
IMPLEMENT_LOG_FUNCTION(Warning)
IMPLEMENT_LOG_FUNCTION(Message)
IMPLEMENT_LOG_FUNCTION(Info)
IMPLEMENT_LOG_FUNCTION(Status)
+void wxSafeShowMessage(const wxString& title, const wxString& text)
+{
+#ifdef __WINDOWS__
+ ::MessageBox(NULL, text, title, MB_OK | MB_ICONSTOP);
+#else
+ wxFprintf(stderr, _T("%s: %s\n"), title.c_str(), text.c_str());
+#endif
+}
+
+// fatal errors can't be suppressed nor handled by the custom log target and
+// always terminate the program
+void wxVLogFatalError(const wxChar *szFormat, va_list argptr)
+{
+ wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+
+ wxSafeShowMessage(_T("Fatal Error"), s_szBuf);
+
+ abort();
+}
+
+void wxLogFatalError(const wxChar *szFormat, ...)
+{
+ va_list argptr;
+ va_start(argptr, szFormat);
+ wxVLogFatalError(szFormat, argptr);
+ va_end(argptr);
+}
+
// same as info, but only if 'verbose' mode is on
+void wxVLogVerbose(const wxChar *szFormat, va_list argptr)
+{
+ if ( IsLoggingEnabled() ) {
+ wxLog *pLog = wxLog::GetActiveTarget();
+ if ( pLog != NULL && pLog->GetVerbose() ) {
+ wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+ wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+
+ wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
+ }
+ }
+}
+
void wxLogVerbose(const wxChar *szFormat, ...)
{
- wxLog *pLog = wxLog::GetActiveTarget();
- if ( pLog != NULL && pLog->GetVerbose() ) {
va_list argptr;
va_start(argptr, szFormat);
- wxVsprintf(s_szBuf, szFormat, argptr);
+ wxVLogVerbose(szFormat, argptr);
va_end(argptr);
-
- wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
- }
}
// debug functions
#ifdef __WXDEBUG__
-#define IMPLEMENT_LOG_DEBUG_FUNCTION(level) \
- void wxLog##level(const wxChar *szFormat, ...) \
- { \
- if ( wxLog::GetActiveTarget() != NULL ) { \
- va_list argptr; \
- va_start(argptr, szFormat); \
- wxVsprintf(s_szBuf, szFormat, argptr); \
- va_end(argptr); \
- \
- wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \
- } \
+#define IMPLEMENT_LOG_DEBUG_FUNCTION(level) \
+ void wxVLog##level(const wxChar *szFormat, va_list argptr) \
+ { \
+ if ( IsLoggingEnabled() ) { \
+ wxCRIT_SECT_LOCKER(locker, gs_csLogBuf); \
+ \
+ wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr); \
+ \
+ wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL)); \
+ } \
+ } \
+ void wxLog##level(const wxChar *szFormat, ...) \
+ { \
+ va_list argptr; \
+ va_start(argptr, szFormat); \
+ wxVLog##level(szFormat, argptr); \
+ va_end(argptr); \
}
- void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)
+ void wxVLogTrace(const wxChar *mask, const wxChar *szFormat, va_list argptr)
{
- wxLog *pLog = wxLog::GetActiveTarget();
+ if ( IsLoggingEnabled() && wxLog::IsAllowedTraceMask(mask) ) {
+ wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+ wxChar *p = s_szBuf;
+ size_t len = s_szBufSize;
+ wxStrncpy(s_szBuf, _T("("), len);
+ len -= 1; // strlen("(")
+ p += 1;
+ wxStrncat(p, mask, len);
+ size_t lenMask = wxStrlen(mask);
+ len -= lenMask;
+ p += lenMask;
- if ( pLog != NULL && wxLog::IsAllowedTraceMask(mask) ) {
- va_list argptr;
- va_start(argptr, szFormat);
- wxVsprintf(s_szBuf, szFormat, argptr);
- va_end(argptr);
+ wxStrncat(p, _T(") "), len);
+ len -= 2;
+ p += 2;
+
+ wxVsnprintf(p, len, szFormat, argptr);
wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
}
}
- void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...)
+ void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)
{
- wxLog *pLog = wxLog::GetActiveTarget();
+ va_list argptr;
+ va_start(argptr, szFormat);
+ wxVLogTrace(mask, szFormat, argptr);
+ va_end(argptr);
+ }
+ void wxVLogTrace(wxTraceMask mask, const wxChar *szFormat, va_list argptr)
+ {
// we check that all of mask bits are set in the current mask, so
// that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
// if both bits are set.
- if ( pLog != NULL && ((pLog->GetTraceMask() & mask) == mask) ) {
- va_list argptr;
- va_start(argptr, szFormat);
- wxVsprintf(s_szBuf, szFormat, argptr);
- va_end(argptr);
+ if ( IsLoggingEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
+ wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+ wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
}
}
+ void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...)
+ {
+ va_list argptr;
+ va_start(argptr, szFormat);
+ wxVLogTrace(mask, szFormat, argptr);
+ va_end(argptr);
+ }
+
#else // release
#define IMPLEMENT_LOG_DEBUG_FUNCTION(level)
#endif
void wxLogSysErrorHelper(long lErrCode)
{
wxChar szErrMsg[LOG_BUFFER_SIZE / 2];
- wxSprintf(szErrMsg, _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
- wxStrncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - wxStrlen(s_szBuf));
+ wxSnprintf(szErrMsg, WXSIZEOF(szErrMsg),
+ _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
+ wxStrncat(s_szBuf, szErrMsg, s_szBufSize - wxStrlen(s_szBuf));
wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
}
+void WXDLLEXPORT wxVLogSysError(const wxChar *szFormat, va_list argptr)
+{
+ if ( IsLoggingEnabled() ) {
+ wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+ wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
+
+ wxLogSysErrorHelper(wxSysErrorCode());
+ }
+}
+
void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
{
va_list argptr;
va_start(argptr, szFormat);
- wxVsprintf(s_szBuf, szFormat, argptr);
+ wxVLogSysError(szFormat, argptr);
va_end(argptr);
+}
+
+void WXDLLEXPORT wxVLogSysError(long lErrCode, const wxChar *szFormat, va_list argptr)
+{
+ if ( IsLoggingEnabled() ) {
+ wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
+
+ wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
- wxLogSysErrorHelper(wxSysErrorCode());
+ wxLogSysErrorHelper(lErrCode);
+ }
}
void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
{
va_list argptr;
va_start(argptr, szFormat);
- wxVsprintf(s_szBuf, szFormat, argptr);
+ wxVLogSysError(lErrCode, szFormat, argptr);
va_end(argptr);
-
- wxLogSysErrorHelper(lErrCode);
}
// ----------------------------------------------------------------------------
wxLog::wxLog()
{
- m_bHasMessages = FALSE;
+}
- // enable verbose messages by default in the debug builds
-#ifdef __WXDEBUG__
- m_bVerbose = TRUE;
-#else // release
- m_bVerbose = FALSE;
-#endif // debug/release
+wxChar *wxLog::SetLogBuffer( wxChar *buf, size_t size)
+{
+ wxChar *oldbuf = s_szBuf;
+
+ if( buf == 0 )
+ {
+ s_szBuf = s_szBufStatic;
+ s_szBufSize = WXSIZEOF( s_szBufStatic );
+ }
+ else
+ {
+ s_szBuf = buf;
+ s_szBufSize = size;
+ }
+
+ return (oldbuf == s_szBufStatic ) ? 0 : oldbuf;
}
wxLog *wxLog::GetActiveTarget()
return pOldLogger;
}
+void wxLog::DontCreateOnDemand()
+{
+ ms_bAutoCreate = FALSE;
+
+ // this is usually called at the end of the program and we assume that it
+ // is *always* called at the end - so we free memory here to avoid false
+ // memory leak reports from wxWin memory tracking code
+ ClearTraceMasks();
+}
+
void wxLog::RemoveTraceMask(const wxString& str)
{
int index = ms_aTraceMasks.Index(str);
ms_aTraceMasks.Remove((size_t)index);
}
+void wxLog::ClearTraceMasks()
+{
+ ms_aTraceMasks.Clear();
+}
+
void wxLog::TimeStamp(wxString *str)
{
if ( ms_timestamp )
wxStrftime(buf, WXSIZEOF(buf), ms_timestamp, localtime(&timeNow));
str->Empty();
- *str << buf << T(": ");
+ *str << buf << wxT(": ");
}
}
case wxLOG_Info:
if ( GetVerbose() )
case wxLOG_Message:
+ case wxLOG_Status:
default: // log unknown log levels too
DoLogString(szString, t);
- // fall through
-
- case wxLOG_Status:
- // nothing to do
break;
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;
}
}
void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t))
{
- wxFAIL_MSG(T("DoLogString must be overriden if it's called."));
+ wxFAIL_MSG(wxT("DoLogString must be overriden if it's called."));
}
void wxLog::Flush()
{
- // do nothing
+ // nothing to do here
}
// ----------------------------------------------------------------------------
m_fp = fp;
}
+#if defined(__WXMAC__) && !defined(__DARWIN__) && defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+
+// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
+
+#ifndef __MetroNubUtils__
+#include "MetroNubUtils.h"
+#endif
+
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
+#ifndef __GESTALT__
+#include <Gestalt.h>
+#endif
+
+#ifndef true
+#define true 1
+#endif
+
+#ifndef false
+#define false 0
+#endif
+
+#if TARGET_API_MAC_CARBON
+
+ #include <CodeFragments.h>
+
+ EXTERN_API_C( long )
+ CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
+
+ ProcPtr gCallUniversalProc_Proc = NULL;
+
+#endif
+
+static MetroNubUserEntryBlock* gMetroNubEntry = NULL;
+
+static long fRunOnce = false;
+
+Boolean IsCompatibleVersion(short inVersion);
+
+/* ---------------------------------------------------------------------------
+ IsCompatibleVersion
+ --------------------------------------------------------------------------- */
+
+Boolean IsCompatibleVersion(short inVersion)
+{
+ Boolean result = false;
+
+ if (fRunOnce)
+ {
+ MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
+
+ result = (inVersion <= block->apiHiVersion);
+ }
+
+ return result;
+}
+
+/* ---------------------------------------------------------------------------
+ IsMetroNubInstalled
+ --------------------------------------------------------------------------- */
+
+Boolean IsMetroNubInstalled()
+{
+ if (!fRunOnce)
+ {
+ long result, value;
+
+ fRunOnce = true;
+ gMetroNubEntry = NULL;
+
+ if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000)
+ {
+ /* look for MetroNub's Gestalt selector */
+ if (Gestalt(kMetroNubUserSignature, &result) == noErr)
+ {
+
+ #if TARGET_API_MAC_CARBON
+ if (gCallUniversalProc_Proc == NULL)
+ {
+ CFragConnectionID connectionID;
+ Ptr mainAddress;
+ Str255 errorString;
+ ProcPtr symbolAddress;
+ OSErr err;
+ CFragSymbolClass symbolClass;
+
+ symbolAddress = NULL;
+ err = GetSharedLibrary("\pInterfaceLib", kPowerPCCFragArch, kFindCFrag,
+ &connectionID, &mainAddress, errorString);
+
+ if (err != noErr)
+ {
+ gCallUniversalProc_Proc = NULL;
+ goto end;
+ }
+
+ err = FindSymbol(connectionID, "\pCallUniversalProc",
+ (Ptr *) &gCallUniversalProc_Proc, &symbolClass);
+
+ if (err != noErr)
+ {
+ gCallUniversalProc_Proc = NULL;
+ goto end;
+ }
+ }
+ #endif
+
+ {
+ MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
+
+ /* make sure the version of the API is compatible */
+ if (block->apiLowVersion <= kMetroNubUserAPIVersion &&
+ kMetroNubUserAPIVersion <= block->apiHiVersion)
+ gMetroNubEntry = block; /* success! */
+ }
+
+ }
+ }
+ }
+
+end:
+
+#if TARGET_API_MAC_CARBON
+ return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL);
+#else
+ return (gMetroNubEntry != NULL);
+#endif
+}
+
+/* ---------------------------------------------------------------------------
+ IsMWDebuggerRunning [v1 API]
+ --------------------------------------------------------------------------- */
+
+Boolean IsMWDebuggerRunning()
+{
+ if (IsMetroNubInstalled())
+ return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
+ else
+ return false;
+}
+
+/* ---------------------------------------------------------------------------
+ AmIBeingMWDebugged [v1 API]
+ --------------------------------------------------------------------------- */
+
+Boolean AmIBeingMWDebugged()
+{
+ if (IsMetroNubInstalled())
+ return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
+ else
+ return false;
+}
+
+/* ---------------------------------------------------------------------------
+ UserSetWatchPoint [v2 API]
+ --------------------------------------------------------------------------- */
+
+OSErr UserSetWatchPoint (Ptr address, long length, WatchPointIDT* watchPointID)
+{
+ if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
+ return CallUserSetWatchPointProc(gMetroNubEntry->userSetWatchPoint,
+ address, length, watchPointID);
+ else
+ return errProcessIsNotClient;
+}
+
+/* ---------------------------------------------------------------------------
+ ClearWatchPoint [v2 API]
+ --------------------------------------------------------------------------- */
+
+OSErr ClearWatchPoint (WatchPointIDT watchPointID)
+{
+ if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
+ return CallClearWatchPointProc(gMetroNubEntry->clearWatchPoint, watchPointID);
+ else
+ return errProcessIsNotClient;
+}
+
+#ifdef __cplusplus
+ }
+#endif
+
+#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ >= 0x2400)
+
void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
{
wxString str;
TimeStamp(&str);
- str << szString << T('\n');
+ str << szString;
fputs(str.mb_str(), m_fp);
+ fputc(_T('\n'), m_fp);
fflush(m_fp);
- // under Windows, programs usually don't have stderr at all, so make show the
- // messages also under debugger
-#ifdef __WXMSW__
- OutputDebugString(str + T('\r'));
+ // under Windows, programs usually don't have stderr at all, so show the
+ // messages also under debugger (unless it's a console program which does
+ // have stderr or unless this is a file logger which doesn't use stderr at
+ // all)
+#if defined(__WXMSW__) && wxUSE_GUI && !defined(__WXMICROWIN__)
+ if ( m_fp == stderr )
+ {
+ str += wxT("\r\n") ;
+ OutputDebugString(str.c_str());
+ }
#endif // MSW
+
+#if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI
+ Str255 pstr ;
+ wxString output = str + wxT(";g") ;
+ wxMacStringToPascal( output.c_str() , pstr ) ;
+
+ Boolean running = false ;
+
+#if defined(__MWERKS__) && (__MWERKS__ >= 0x2400)
+
+ if ( IsMWDebuggerRunning() && AmIBeingMWDebugged() )
+ {
+ running = true ;
+ }
+
+#endif
+
+ if (running)
+ {
+#ifdef __powerc
+ DebugStr(pstr);
+#else
+ SysBreakStr(pstr);
+#endif
+ }
+#endif // Mac
}
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
#if wxUSE_STD_IOSTREAM
-wxLogStream::wxLogStream(ostream *ostr)
+#include "wx/ioswrap.h"
+wxLogStream::wxLogStream(wxSTD ostream *ostr)
{
if ( ostr == NULL )
- m_ostr = &cerr;
+ m_ostr = &wxSTD cerr;
else
m_ostr = ostr;
}
void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
{
- (*m_ostr) << wxConvertWX2MB(szString) << endl;
+ wxString str;
+ TimeStamp(&str);
+ (*m_ostr) << str << wxConvertWX2MB(szString) << wxSTD endl;
}
#endif // wxUSE_STD_IOSTREAM
+// ----------------------------------------------------------------------------
+// wxLogChain
+// ----------------------------------------------------------------------------
+
+wxLogChain::wxLogChain(wxLog *logger)
+{
+ m_bPassMessages = TRUE;
+
+ m_logNew = logger;
+ m_logOld = wxLog::SetActiveTarget(this);
+}
+
+wxLogChain::~wxLogChain()
+{
+ delete m_logOld;
+
+ if ( m_logNew != this )
+ delete m_logNew;
+}
+
+void wxLogChain::SetLog(wxLog *logger)
+{
+ if ( m_logNew != this )
+ delete m_logNew;
+
+ m_logNew = logger;
+}
+
+void wxLogChain::Flush()
+{
+ if ( m_logOld )
+ m_logOld->Flush();
+
+ // be careful to avoid infinite recursion
+ if ( m_logNew && m_logNew != this )
+ m_logNew->Flush();
+}
+
+void wxLogChain::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+{
+ // let the previous logger show it
+ if ( m_logOld && IsPassingMessages() )
+ {
+ // bogus cast just to access protected DoLog
+ ((wxLogChain *)m_logOld)->DoLog(level, szString, t);
+ }
+
+ if ( m_logNew && m_logNew != this )
+ {
+ // as above...
+ ((wxLogChain *)m_logNew)->DoLog(level, szString, t);
+ }
+}
+
+// ----------------------------------------------------------------------------
+// wxLogPassThrough
+// ----------------------------------------------------------------------------
+
+#ifdef __VISUALC__
+ // "'this' : used in base member initializer list" - so what?
+ #pragma warning(disable:4355)
+#endif // VC++
+
+wxLogPassThrough::wxLogPassThrough()
+ : wxLogChain(this)
+{
+}
+
+#ifdef __VISUALC__
+ #pragma warning(default:4355)
+#endif // VC++
+
// ============================================================================
// Global functions/variables
// ============================================================================
wxLog *wxLog::ms_pLogger = (wxLog *)NULL;
bool wxLog::ms_doLog = TRUE;
bool wxLog::ms_bAutoCreate = TRUE;
+bool wxLog::ms_bVerbose = FALSE;
+
+wxLogLevel wxLog::ms_logLevel = wxLOG_Max; // log everything by default
-const wxChar *wxLog::ms_timestamp = T("%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;
// get error code from syste
unsigned long wxSysErrorCode()
{
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
#ifdef __WIN32__
return ::GetLastError();
#else //WIN16
if ( nErrCode == 0 )
nErrCode = wxSysErrorCode();
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__WXMICROWIN__)
#ifdef __WIN32__
static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
0, NULL);
// copy it to our buffer and free memory
- wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
- s_szBuf[WXSIZEOF(s_szBuf) - 1] = T('\0');
- LocalFree(lpMsgBuf);
-
- // returned string is capitalized and ended with '\r\n' - bad
- s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
- size_t len = wxStrlen(s_szBuf);
- if ( len > 0 ) {
- // truncate string
- if ( s_szBuf[len - 2] == T('\r') )
- s_szBuf[len - 2] = T('\0');
+ if( lpMsgBuf != 0 ) {
+ wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
+ s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
+
+ LocalFree(lpMsgBuf);
+
+ // returned string is capitalized and ended with '\r\n' - bad
+ s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
+ size_t len = wxStrlen(s_szBuf);
+ if ( len > 0 ) {
+ // truncate string
+ if ( s_szBuf[len - 2] == wxT('\r') )
+ s_szBuf[len - 2] = wxT('\0');
+ }
+ }
+ else {
+ s_szBuf[0] = wxT('\0');
}
return s_szBuf;
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
}
-// ----------------------------------------------------------------------------
-// debug helper
-// ----------------------------------------------------------------------------
-
-#ifdef __WXDEBUG__
-
-// break into the debugger
-void Trap()
-{
-#ifdef __WXMSW__
- DebugBreak();
-#elif defined(__WXMAC__)
-#if __powerc
- Debugger();
-#else
- SysBreak();
-#endif
-#elif defined(__UNIX__)
- raise(SIGTRAP);
-#else
- // TODO
-#endif // Win/Unix
-}
-
-// this function is called when an assert fails
-void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
-{
- // this variable can be set to true to suppress "assert failure" messages
- static bool s_bNoAsserts = FALSE;
- static bool s_bInAssert = FALSE; // FIXME MT-unsafe
-
- if ( s_bInAssert ) {
- // He-e-e-e-elp!! we're trapped in endless loop
- Trap();
-
- s_bInAssert = FALSE;
-
- return;
- }
-
- s_bInAssert = TRUE;
-
- wxChar szBuf[LOG_BUFFER_SIZE];
-
- // make life easier for people using VC++ IDE: clicking on the message
- // will take us immediately to the place of the failed assert
-#ifdef __VISUALC__
- wxSprintf(szBuf, T("%s(%d): assert failed"), szFile, nLine);
-#else // !VC++
- // make the error message more clear for all the others
- wxSprintf(szBuf, T("Assert failed in file %s at line %d"), szFile, nLine);
-#endif // VC/!VC
-
- if ( szMsg != NULL ) {
- wxStrcat(szBuf, T(": "));
- wxStrcat(szBuf, szMsg);
- }
- else {
- wxStrcat(szBuf, T("."));
- }
-
- if ( !s_bNoAsserts ) {
- // send it to the normal log destination
- wxLogDebug(szBuf);
-
-#if wxUSE_GUI
- // this message is intentionally not translated - it is for
- // developpers only
- wxStrcat(szBuf, T("\nDo you want to stop the program?"
- "\nYou can also choose [Cancel] to suppress "
- "further warnings."));
-
- switch ( wxMessageBox(szBuf, _("Debug"),
- wxYES_NO | wxCANCEL | wxICON_STOP ) ) {
- case wxYES:
- Trap();
- break;
-
- case wxCANCEL:
- s_bNoAsserts = TRUE;
- break;
-
- //case wxNO: nothing to do
- }
-#else // !GUI
- Trap();
-#endif // GUI/!GUI
- }
-
- s_bInAssert = FALSE;
-}
-
-#endif //WXDEBUG
+#endif //wxUSE_LOG
+// vi:sts=4:sw=4:et
projects / wxWidgets.git / blobdiff