Improved size handling.

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

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 9d9b21c6608c8a32d7a0951d6bb907beb59f6fb5..a6a941d53ec2227e276d6a61ba338067bc5d6dd0 100644 (file)
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -6,7 +6,7 @@
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     29/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,51 +17,47 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-  #pragma implementation "log.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #endif
 

-// wxWindows
+#if wxUSE_LOG
+
+// wxWidgets

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/string.h"
-    #include "wx/intl.h"

     #include "wx/app.h"
     #include "wx/app.h"

-
-    #if wxUSE_GUI
-        #include "wx/window.h"
-        #ifdef __WXMSW__
-            #include "wx/msw/private.h"
-        #endif
-    #endif
+    #include "wx/arrstr.h"
+    #include "wx/intl.h"
+    #include "wx/string.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

-#include  "wx/file.h"
-#include  "wx/textfile.h"
-#include  "wx/utils.h"
-#include  "wx/wxchar.h"
-#include  "wx/log.h"
-#include  "wx/thread.h"
-
-#if wxUSE_LOG
+#include "wx/apptrait.h"
+#include "wx/file.h"
+#include "wx/log.h"
+#include "wx/msgout.h"
+#include "wx/textfile.h"
+#include "wx/thread.h"
+#include "wx/utils.h"
+#include "wx/wxchar.h"

 
 // other standard headers
 
 // other standard headers

-#include  <errno.h>
-#include  <stdlib.h>
-#include  <time.h>
+#ifndef __WXWINCE__
+#include <errno.h>
+#endif
+
+#include <stdlib.h>

 
 

-#if defined(__WXMSW__)
-  #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString
+#ifndef __WXWINCE__
+#include <time.h>
+#else
+#include "wx/msw/wince/time.h"

 #endif
 
 #endif
 

-#if defined(__WXMAC__)
-  #include  "wx/mac/private.h"  // includes mac headers
+#if defined(__WINDOWS__)
+    #include "wx/msw/private.h" // includes windows.h

 #endif
 
 // ----------------------------------------------------------------------------
 #endif
 
 // ----------------------------------------------------------------------------


@@ -88,7 +84,10 @@
 #define LOG_BUFFER_SIZE   (4096)
 
 // static buffer for error messages
 #define LOG_BUFFER_SIZE   (4096)
 
 // static buffer for error messages

-static wxChar s_szBuf[LOG_BUFFER_SIZE];
+static wxChar   s_szBufStatic[LOG_BUFFER_SIZE];
+
+static wxChar  *s_szBuf     = s_szBufStatic;
+static size_t   s_szBufSize = WXSIZEOF( s_szBufStatic );

 
 #if wxUSE_THREADS
 
 
 #if wxUSE_THREADS
 


@@ -110,13 +109,24 @@ static inline bool IsLoggingEnabled()
 //     macros and not all compilers inline vararg functions.
 // ----------------------------------------------------------------------------
 
 //     macros and not all compilers inline vararg functions.
 // ----------------------------------------------------------------------------
 

+// wrapper for wxVsnprintf(s_szBuf) which always NULL-terminates it
+static inline void PrintfInLogBug(const wxChar *szFormat, va_list argptr)
+{
+    if ( wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr) < 0 )
+    {
+        // must NUL-terminate it manually
+        s_szBuf[s_szBufSize - 1] = _T('\0');
+    }
+    //else: NUL-terminated by vsnprintf()
+}
+

 // generic log function
 void wxVLogGeneric(wxLogLevel level, const wxChar *szFormat, va_list argptr)
 {
     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
 // generic log function
 void wxVLogGeneric(wxLogLevel level, const wxChar *szFormat, va_list argptr)
 {
     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 

-        wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+        PrintfInLogBug(szFormat, argptr);

 
         wxLog::OnLog(level, s_szBuf, time(NULL));
     }
 
         wxLog::OnLog(level, s_szBuf, time(NULL));
     }


@@ -136,35 +146,69 @@ void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
     if ( IsLoggingEnabled() ) {                                     \
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
                                                                     \
     if ( IsLoggingEnabled() ) {                                     \
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
                                                                     \

-      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);    \
+      PrintfInLogBug(szFormat, argptr);                             \

                                                                     \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));             \
     }                                                               \
   }                                                                 \
                                                                     \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));             \
     }                                                               \
   }                                                                 \

+                                                                    \

   void wxLog##level(const wxChar *szFormat, ...)                    \
   {                                                                 \
     va_list argptr;                                                 \
     va_start(argptr, szFormat);                                     \
   void wxLog##level(const wxChar *szFormat, ...)                    \
   {                                                                 \
     va_list argptr;                                                 \
     va_start(argptr, szFormat);                                     \

-    wxVLog##level(szFormat, argptr);                                 \
+    wxVLog##level(szFormat, argptr);                                \

     va_end(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)
 
 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);
+
+#ifdef __WXWINCE__
+    ExitThread(3);
+#else
+    abort();
+#endif
+}
+
+void wxLogFatalError(const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogFatalError(szFormat, argptr);
+
+    // some compilers warn about unreachable code and it shouldn't matter
+    // for the others anyhow...
+    //va_end(argptr);
+}
+

 // same as info, but only if 'verbose' mode is on
 void wxVLogVerbose(const wxChar *szFormat, va_list argptr)
 {
     if ( IsLoggingEnabled() ) {
 // 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() ) {
+        if ( wxLog::GetActiveTarget() != NULL && wxLog::GetVerbose() ) {

             wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
             wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 

-            wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+            wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);

 
             wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
         }
 
             wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
         }


@@ -187,7 +231,7 @@ void wxLogVerbose(const wxChar *szFormat, ...)
     if ( IsLoggingEnabled() ) {                                     \
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
                                                                     \
     if ( IsLoggingEnabled() ) {                                     \
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
                                                                     \

-      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);    \
+      wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);    \

                                                                     \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));             \
     }                                                               \
                                                                     \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));             \
     }                                                               \


@@ -206,7 +250,7 @@ void wxLogVerbose(const wxChar *szFormat, ...)
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
       wxChar *p = s_szBuf;
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
       wxChar *p = s_szBuf;

-      size_t len = WXSIZEOF(s_szBuf);
+      size_t len = s_szBufSize;

       wxStrncpy(s_szBuf, _T("("), len);
       len -= 1; // strlen("(")
       p += 1;
       wxStrncpy(s_szBuf, _T("("), len);
       len -= 1; // strlen("(")
       p += 1;


@@ -220,7 +264,7 @@ void wxLogVerbose(const wxChar *szFormat, ...)
       p += 2;
 
       wxVsnprintf(p, len, szFormat, argptr);
       p += 2;
 
       wxVsnprintf(p, len, szFormat, argptr);

-      
+

       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
     }
   }
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
     }
   }


@@ -241,7 +285,7 @@ void wxLogVerbose(const wxChar *szFormat, ...)
     if ( IsLoggingEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
     if ( IsLoggingEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 

-      wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+      wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);

 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
     }
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
     }


@@ -271,7 +315,7 @@ void wxLogSysErrorHelper(long lErrCode)
     wxChar szErrMsg[LOG_BUFFER_SIZE / 2];
     wxSnprintf(szErrMsg, WXSIZEOF(szErrMsg),
                _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));
     wxChar szErrMsg[LOG_BUFFER_SIZE / 2];
     wxSnprintf(szErrMsg, WXSIZEOF(szErrMsg),
                _(" (error %ld: %s)"), lErrCode, wxSysErrorMsg(lErrCode));

-    wxStrncat(s_szBuf, szErrMsg, WXSIZEOF(s_szBuf) - wxStrlen(s_szBuf));
+    wxStrncat(s_szBuf, szErrMsg, s_szBufSize - wxStrlen(s_szBuf));

 
     wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
 }
 
     wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
 }


@@ -281,7 +325,7 @@ void WXDLLEXPORT wxVLogSysError(const wxChar *szFormat, va_list argptr)
     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 

-        wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+        wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);

 
         wxLogSysErrorHelper(wxSysErrorCode());
     }
 
         wxLogSysErrorHelper(wxSysErrorCode());
     }


@@ -300,7 +344,7 @@ void WXDLLEXPORT wxVLogSysError(long lErrCode, const wxChar *szFormat, va_list a
     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 

-        wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+        wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);

 
         wxLogSysErrorHelper(lErrCode);
     }
 
         wxLogSysErrorHelper(lErrCode);
     }


@@ -318,9 +362,22 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
 // wxLog class implementation
 // ----------------------------------------------------------------------------
 
 // wxLog class implementation
 // ----------------------------------------------------------------------------
 

-wxLog::wxLog()
+wxChar *wxLog::SetLogBuffer( wxChar *buf, size_t size)

 {
 {

-    m_bHasMessages = FALSE;
+    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()
 }
 
 wxLog *wxLog::GetActiveTarget()


@@ -328,17 +385,17 @@ wxLog *wxLog::GetActiveTarget()
     if ( ms_bAutoCreate && ms_pLogger == NULL ) {
         // prevent infinite recursion if someone calls wxLogXXX() from
         // wxApp::CreateLogTarget()
     if ( ms_bAutoCreate && ms_pLogger == NULL ) {
         // prevent infinite recursion if someone calls wxLogXXX() from
         // wxApp::CreateLogTarget()

-        static bool s_bInGetActiveTarget = FALSE;
+        static bool s_bInGetActiveTarget = false;

         if ( !s_bInGetActiveTarget ) {
         if ( !s_bInGetActiveTarget ) {

-            s_bInGetActiveTarget = TRUE;
+            s_bInGetActiveTarget = true;

 
             // ask the application to create a log target for us
             if ( wxTheApp != NULL )
 
             // ask the application to create a log target for us
             if ( wxTheApp != NULL )

-                ms_pLogger = wxTheApp->CreateLogTarget();
+                ms_pLogger = wxTheApp->GetTraits()->CreateLogTarget();

             else
                 ms_pLogger = new wxLogStderr;
 
             else
                 ms_pLogger = new wxLogStderr;
 

-            s_bInGetActiveTarget = FALSE;
+            s_bInGetActiveTarget = false;

 
             // do nothing if it fails - what can we do?
         }
 
             // do nothing if it fails - what can we do?
         }


@@ -363,7 +420,7 @@ wxLog *wxLog::SetActiveTarget(wxLog *pLogger)
 
 void wxLog::DontCreateOnDemand()
 {
 
 void wxLog::DontCreateOnDemand()
 {

-    ms_bAutoCreate = FALSE;
+    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
 
     // 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


@@ -375,7 +432,7 @@ void wxLog::RemoveTraceMask(const wxString& str)
 {
     int index = ms_aTraceMasks.Index(str);
     if ( index != wxNOT_FOUND )
 {
     int index = ms_aTraceMasks.Index(str);
     if ( index != wxNOT_FOUND )

-        ms_aTraceMasks.Remove((size_t)index);
+        ms_aTraceMasks.RemoveAt((size_t)index);

 }
 
 void wxLog::ClearTraceMasks()
 }
 
 void wxLog::ClearTraceMasks()


@@ -404,7 +461,11 @@ void wxLog::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
             DoLogString(wxString(_("Fatal error: ")) + szString, t);
             DoLogString(_("Program aborted."), t);
             Flush();
             DoLogString(wxString(_("Fatal error: ")) + szString, t);
             DoLogString(_("Program aborted."), t);
             Flush();

+#ifdef __WXWINCE__
+            ExitThread(3);
+#else

             abort();
             abort();

+#endif

             break;
 
         case wxLOG_Error:
             break;
 
         case wxLOG_Error:


@@ -444,212 +505,75 @@ void wxLog::DoLogString(const wxChar *WXUNUSED(szString), time_t WXUNUSED(t))
 
 void wxLog::Flush()
 {
 
 void wxLog::Flush()
 {

-    // remember that we don't have any more messages to show
-    m_bHasMessages = FALSE;
+    // nothing to do here

 }
 
 }
 

-// ----------------------------------------------------------------------------
-// wxLogStderr class implementation
-// ----------------------------------------------------------------------------
-
-wxLogStderr::wxLogStderr(FILE *fp)
+/*static*/ bool wxLog::IsAllowedTraceMask(const wxChar *mask)

 {
 {

-    if ( fp == NULL )
-        m_fp = stderr;
-    else
-        m_fp = fp;
+    for ( wxArrayString::iterator it = ms_aTraceMasks.begin(),
+                                  en = ms_aTraceMasks.end();
+         it != en; ++it )
+        if ( *it == mask)
+            return true;
+    return false;

 }
 
 }
 

-#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"
-#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
+// ----------------------------------------------------------------------------
+// wxLogBuffer implementation
+// ----------------------------------------------------------------------------

 
 

-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
+void wxLogBuffer::Flush()
+{
+    if ( !m_str.empty() )
+    {
+        wxMessageOutputBest out;
+        out.Printf(_T("%s"), m_str.c_str());
+        m_str.clear();
+    }

 }
 
 }
 

-/* ---------------------------------------------------------------------------
-               IsMWDebuggerRunning                                                                                     [v1 API]
-   --------------------------------------------------------------------------- */
-
-Boolean IsMWDebuggerRunning()
+void wxLogBuffer::DoLog(wxLogLevel level, const wxChar *szString, time_t t)

 {
 {

-       if (IsMetroNubInstalled())
-               return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
-       else
-               return false;
-}
+    switch ( level )
+    {
+        case wxLOG_Trace:
+        case wxLOG_Debug:
+#ifdef __WXDEBUG__
+            // don't put debug messages in the buffer, we don't want to show
+            // them to the user in a msg box, log them immediately
+            {
+                wxString str;
+                TimeStamp(&str);
+                str += szString;

 
 

-/* ---------------------------------------------------------------------------
-               AmIBeingMWDebugged                                                                                      [v1 API]
-   --------------------------------------------------------------------------- */
+                wxMessageOutputDebug dbgout;
+                dbgout.Printf(_T("%s\n"), str.c_str());
+            }
+#endif // __WXDEBUG__
+            break;

 
 

-Boolean AmIBeingMWDebugged()
-{
-       if (IsMetroNubInstalled())
-               return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
-       else
-               return false;
+        default:
+            wxLog::DoLog(level, szString, t);
+    }

 }
 
 }
 

-/* ---------------------------------------------------------------------------
-               UserSetWatchPoint                                                                                       [v2 API]
-   --------------------------------------------------------------------------- */
-
-OSErr UserSetWatchPoint (Ptr address, long length, WatchPointIDT* watchPointID)
+void wxLogBuffer::DoLogString(const wxChar *szString, time_t WXUNUSED(t))

 {
 {

-       if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
-               return CallUserSetWatchPointProc(gMetroNubEntry->userSetWatchPoint,
-                                                                                       address, length, watchPointID);
-       else
-               return errProcessIsNotClient;
+    m_str << szString << _T("\n");

 }
 
 }
 

-/* ---------------------------------------------------------------------------
-               ClearWatchPoint                                                                                         [v2 API]
-   --------------------------------------------------------------------------- */
+// ----------------------------------------------------------------------------
+// wxLogStderr class implementation
+// ----------------------------------------------------------------------------

 
 

-OSErr ClearWatchPoint (WatchPointIDT watchPointID)
+wxLogStderr::wxLogStderr(FILE *fp)

 {
 {

-       if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
-               return CallClearWatchPointProc(gMetroNubEntry->clearWatchPoint,
-                                                                                       watchPointID);
-       else
-               return errProcessIsNotClient;
+    if ( fp == NULL )
+        m_fp = stderr;
+    else
+        m_fp = fp;

 }
 
 }
 

-#ifdef __cplusplus
-       }
-#endif
-
-#endif // !TARGET_API_MAC_CARBON
-
-#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ > 0x5300)
-

 void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     wxString str;
 void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     wxString str;


@@ -660,38 +584,19 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
     fputc(_T('\n'), m_fp);
     fflush(m_fp);
 
     fputc(_T('\n'), m_fp);
     fflush(m_fp);
 

-    // 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 && !defined(__WXMICROWIN__)
-    str += wxT("\r\n") ;
-    OutputDebugString(str.c_str());
-#endif // MSW
-#if defined(__WXMAC__) && !defined(__DARWIN__) && wxUSE_GUI
-    Str255 pstr ;
-    strcpy( (char*) pstr , str.c_str() ) ;
-    strcat( (char*) pstr , ";g" ) ;
-    c2pstr( (char*) pstr ) ;
-
-    Boolean running = false ;
-
-#if !TARGET_API_MAC_CARBON && (__MWERKS__ > 0x5300)
-
-    if ( IsMWDebuggerRunning() && AmIBeingMWDebugged() )
+    // under GUI systems such as Windows or Mac, programs usually don't have
+    // stderr at all, so show the messages also somewhere else, typically in
+    // the debugger window so that they go at least somewhere instead of being
+    // simply lost
+    if ( m_fp == stderr )

     {
     {

-        running = true ;
-    }
-
-#endif
-
-    if (running)
-    {
-#ifdef __powerc
-        DebugStr(pstr);
-#else
-        SysBreakStr(pstr);
-#endif
+        wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+        if ( traits && !traits->HasStderr() )
+        {
+            wxMessageOutputDebug dbgout;
+            dbgout.Printf(_T("%s\n"), str.c_str());
+        }

     }
     }

-#endif // Mac

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -699,6 +604,7 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM
 // ----------------------------------------------------------------------------
 
 #if wxUSE_STD_IOSTREAM

+#include "wx/ioswrap.h"

 wxLogStream::wxLogStream(wxSTD ostream *ostr)
 {
     if ( ostr == NULL )
 wxLogStream::wxLogStream(wxSTD ostream *ostr)
 {
     if ( ostr == NULL )


@@ -721,16 +627,24 @@ void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 
 wxLogChain::wxLogChain(wxLog *logger)
 {
 
 wxLogChain::wxLogChain(wxLog *logger)
 {

+    m_bPassMessages = true;
+

     m_logNew = logger;
     m_logOld = wxLog::SetActiveTarget(this);
 }
 
     m_logNew = logger;
     m_logOld = wxLog::SetActiveTarget(this);
 }
 

-void wxLogChain::SetLog(wxLog *logger)
+wxLogChain::~wxLogChain()

 {
 {

+    delete m_logOld;
+

     if ( m_logNew != this )
         delete m_logNew;
     if ( m_logNew != this )
         delete m_logNew;

+}

 
 

-    wxLog::SetActiveTarget(logger);
+void wxLogChain::SetLog(wxLog *logger)
+{
+    if ( m_logNew != this )
+        delete m_logNew;

 
     m_logNew = logger;
 }
 
     m_logNew = logger;
 }


@@ -740,7 +654,7 @@ void wxLogChain::Flush()
     if ( m_logOld )
         m_logOld->Flush();
 
     if ( m_logOld )
         m_logOld->Flush();
 

-    // be careful to avoid inifinite recursion
+    // be careful to avoid infinite recursion

     if ( m_logNew && m_logNew != this )
         m_logNew->Flush();
 }
     if ( m_logNew && m_logNew != this )
         m_logNew->Flush();
 }


@@ -788,17 +702,15 @@ wxLogPassThrough::wxLogPassThrough()
 // ----------------------------------------------------------------------------
 
 wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;
 // ----------------------------------------------------------------------------
 
 wxLog          *wxLog::ms_pLogger      = (wxLog *)NULL;

-bool            wxLog::ms_doLog        = TRUE;
-bool            wxLog::ms_bAutoCreate  = TRUE;
-bool            wxLog::ms_bVerbose     = FALSE;
+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

 
 size_t          wxLog::ms_suspendCount = 0;
 
 
 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
+const wxChar   *wxLog::ms_timestamp    = wxT("%X");  // time only, no date

 
 wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 wxArrayString   wxLog::ms_aTraceMasks;
 
 wxTraceMask     wxLog::ms_ulTraceMask  = (wxTraceMask)0;
 wxArrayString   wxLog::ms_aTraceMasks;


@@ -848,12 +760,7 @@ static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz)
 unsigned long wxSysErrorCode()
 {
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
 unsigned long wxSysErrorCode()
 {
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)

-#ifdef  __WIN32__

     return ::GetLastError();
     return ::GetLastError();

-#else   //WIN16
-    // TODO what to do on Windows 3.1?
-    return 0;
-#endif  //WIN16/32

 #else   //Unix
     return errno;
 #endif  //Win/Unix
 #else   //Unix
     return errno;
 #endif  //Win/Unix


@@ -866,19 +773,33 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
         nErrCode = wxSysErrorCode();
 
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
         nErrCode = wxSysErrorCode();
 
 #if defined(__WXMSW__) && !defined(__WXMICROWIN__)

-#ifdef  __WIN32__

     static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
 
     // get error message from system
     LPVOID lpMsgBuf;
     static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
 
     // get error message from system
     LPVOID lpMsgBuf;

-    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-            NULL, nErrCode,
+    if ( ::FormatMessage
+         (
+            FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+            NULL,
+            nErrCode,

             MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
             (LPTSTR)&lpMsgBuf,
             MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
             (LPTSTR)&lpMsgBuf,

-            0, NULL);
+            0,
+            NULL
+         ) == 0 )
+    {
+        // if this happens, something is seriously wrong, so don't use _() here
+        // for safety
+        wxSprintf(s_szBuf, _T("unknown error %lx"), nErrCode);
+        return s_szBuf;
+    }
+

 
     // copy it to our buffer and free memory
 
     // copy it to our buffer and free memory

-    if( lpMsgBuf != 0 ) {
+    // Crashes on SmartPhone (FIXME)
+#if !defined(__SMARTPHONE__) /* of WinCE */
+    if( lpMsgBuf != 0 )
+    {

         wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
         s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
 
         wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
         s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
 


@@ -893,16 +814,14 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
                 s_szBuf[len - 2] = wxT('\0');
         }
     }
                 s_szBuf[len - 2] = wxT('\0');
         }
     }

-    else {
+    else
+#endif
+    {

         s_szBuf[0] = wxT('\0');
     }
 
     return s_szBuf;
         s_szBuf[0] = wxT('\0');
     }
 
     return s_szBuf;

-#else   //Win16
-    // TODO
-    return NULL;
-#endif // Win16/32
-#else   // Unix
+#else   // Unix-WXMICROWIN

 #if wxUSE_UNICODE
     static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
     wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);
 #if wxUSE_UNICODE
     static wxChar s_szBuf[LOG_BUFFER_SIZE / 2];
     wxConvCurrent->MB2WC(s_szBuf, strerror(nErrCode), WXSIZEOF(s_szBuf) -1);


@@ -910,7 +829,8 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
 #else
     return strerror((int)nErrCode);
 #endif
 #else
     return strerror((int)nErrCode);
 #endif

-#endif  // Win/Unix
+#endif  // Win/Unix-WXMICROWIN

 }
 
 }
 

-#endif //wxUSE_LOG
+#endif // wxUSE_LOG
+