From dd85fc6b89333821b22ae76808914d8e1d508095 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Mon, 20 Sep 1999 16:10:03 +0000
Subject: [PATCH 1/1] started separating GUI parts of wxLog from the rest

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 Makefile.in                    |   8 +-
 distrib/msw/tmake/filelist.txt |   1 +
 include/wx/log.h               |   4 +
 src/common/log.cpp             | 514 +------------------------------
 src/generic/logg.cpp           | 542 +++++++++++++++++++++++++++++++++
 src/msw/makefile.b32           |   5 +-
 src/msw/makefile.bcc           |   5 +-
 src/msw/makefile.dos           |   8 +-
 src/msw/makefile.g95           |   3 +-
 src/msw/makefile.sc            |   3 +-
 src/msw/makefile.vc            |   3 +-
 src/msw/makefile.wat           |   6 +-
 12 files changed, 592 insertions(+), 510 deletions(-)
 create mode 100644 src/generic/logg.cpp

diff --git a/Makefile.in b/Makefile.in
index 7e70a30446..b3705be048 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #
-# This file was automatically generated by tmake at 19:22, 1999/09/18
+# This file was automatically generated by tmake at 17:51, 1999/09/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE UNX.T!
 
 #
@@ -583,6 +583,7 @@ GTK_GENERICOBJS = \
 		imaglist.o \
 		laywin.o \
 		listctrl.o \
+		logg.o \
 		msgdlgg.o \
 		numdlgg.o \
 		panelg.o \
@@ -615,6 +616,7 @@ GTK_GENERICDEPS = \
 		imaglist.d \
 		laywin.d \
 		listctrl.d \
+		logg.d \
 		msgdlgg.d \
 		numdlgg.d \
 		panelg.d \
@@ -936,6 +938,7 @@ MOTIF_GENERICOBJS = \
 		imaglist.o \
 		laywin.o \
 		listctrl.o \
+		logg.o \
 		msgdlgg.o \
 		notebook.o \
 		numdlgg.o \
@@ -972,6 +975,7 @@ MOTIF_GENERICDEPS = \
 		imaglist.d \
 		laywin.d \
 		listctrl.d \
+		logg.d \
 		msgdlgg.d \
 		notebook.d \
 		numdlgg.d \
@@ -1285,6 +1289,7 @@ MSW_GENERICOBJS = \
 		dirdlgg.o \
 		gridg.o \
 		laywin.o \
+		logg.o \
 		numdlgg.o \
 		panelg.o \
 		progdlgg.o \
@@ -1306,6 +1311,7 @@ MSW_GENERICDEPS = \
 		dirdlgg.d \
 		gridg.d \
 		laywin.d \
+		logg.d \
 		numdlgg.d \
 		panelg.d \
 		progdlgg.d \
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 15024491bc..955fd77a3c 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -66,6 +66,7 @@ helpxlp.cpp	G	G,R
 imaglist.cpp	G	16
 laywin.cpp	G
 listctrl.cpp	G	16
+logg.cpp	G
 msgdlgg.cpp	G	G
 notebook.cpp	G	16,R
 panelg.cpp	G
diff --git a/include/wx/log.h b/include/wx/log.h
index 6a935070fc..31f283dfdb 100644
--- a/include/wx/log.h
+++ b/include/wx/log.h
@@ -241,6 +241,10 @@ protected:
 };
 #endif
 
+// the following log targets are only compiled in if the we're compiling the
+// GUI part (andnot just the base one) of the library, they're implemented in
+// src/generic/logg.cpp *and not src/common/log.cpp unlike all the rest)
+
 #ifndef wxUSE_NOGUI
 
 // log everything to a text window (GUI only of course)
diff --git a/src/common/log.cpp b/src/common/log.cpp
index 34391202ed..f811d2b15d 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -16,6 +16,7 @@
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
+
 #ifdef __GNUG__
   #pragma implementation "log.h"
 #endif
@@ -30,18 +31,16 @@
 // wxWindows
 #ifndef WX_PRECOMP
   #include "wx/window.h"
-#ifdef __WXMSW__
-  #include "wx/msw/private.h"
-#endif
+  #ifdef __WXMSW__
+    #include "wx/msw/private.h"
+  #endif
   #include  "wx/event.h"
   #include  "wx/app.h"
   #include  "wx/string.h"
   #include  "wx/intl.h"
-  #include  "wx/menu.h"
-  #include  "wx/frame.h"
-  #include  "wx/msgdlg.h"
-  #include  "wx/filedlg.h"
-  #include  "wx/textctrl.h"
+  #ifndef wxUSE_NOGUI
+    #include "wx/msgdlg.h"
+  #endif  
 #endif //WX_PRECOMP
 
 #include  "wx/file.h"
@@ -74,14 +73,6 @@
   static void wxLogWrap(FILE *f, const char *pszPrefix, const char *psz);
 #endif
 
-// ----------------------------------------------------------------------------
-// global variables
-// ----------------------------------------------------------------------------
-
-// we use a global variable to store the frame pointer for wxLogStatus - bad,
-// but it's he easiest way
-static wxFrame *gs_pFrame; // FIXME MT-unsafe
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -133,24 +124,6 @@ IMPLEMENT_LOG_FUNCTION(Message)
 IMPLEMENT_LOG_FUNCTION(Info)
 IMPLEMENT_LOG_FUNCTION(Status)
 
-// accepts an additional argument which tells to which frame the output should
-// be directed
-void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
-{
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL ) {
-    va_list argptr;
-    va_start(argptr, szFormat);
-    wxVsprintf(s_szBuf, szFormat, argptr);
-    va_end(argptr);
-
-    wxASSERT( gs_pFrame == NULL ); // should be reset!
-    gs_pFrame = pFrame;
-    wxLog::OnLog(wxLOG_Status, s_szBuf, time(NULL));
-    gs_pFrame = (wxFrame *) NULL;
-  }
-}
-
 // same as info, but only if 'verbose' mode is on
 void wxLogVerbose(const wxChar *szFormat, ...)
 {
@@ -276,15 +249,15 @@ wxLog *wxLog::GetActiveTarget()
         if ( !s_bInGetActiveTarget ) {
             s_bInGetActiveTarget = TRUE;
 
-#ifdef  wxUSE_NOGUI
+#ifdef wxUSE_NOGUI
             ms_pLogger = new wxLogStderr;
-#else
+#else // GUI
             // ask the application to create a log target for us
             if ( wxTheApp != NULL )
                 ms_pLogger = wxTheApp->CreateLogTarget();
             else
                 ms_pLogger = new wxLogStderr;
-#endif
+#endif // !GUI/GUI
 
             s_bInGetActiveTarget = FALSE;
 
@@ -425,469 +398,6 @@ void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 }
 #endif // wxUSE_STD_IOSTREAM
 
-#ifndef wxUSE_NOGUI
-
-// ----------------------------------------------------------------------------
-// wxLogTextCtrl implementation
-// ----------------------------------------------------------------------------
-
-wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
-{
-    m_pTextCtrl = pTextCtrl;
-}
-
-void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t t)
-{
-    wxString msg;
-    TimeStamp(&msg);
-    msg << szString << _T('\n');
-
-    m_pTextCtrl->AppendText(msg);
-}
-
-// ----------------------------------------------------------------------------
-// wxLogGui implementation (FIXME MT-unsafe)
-// ----------------------------------------------------------------------------
-
-wxLogGui::wxLogGui()
-{
-    Clear();
-}
-
-void wxLogGui::Clear()
-{
-    m_bErrors = m_bWarnings = FALSE;
-    m_aMessages.Empty();
-    m_aTimes.Empty();
-}
-
-void wxLogGui::Flush()
-{
-    if ( !m_bHasMessages )
-        return;
-
-    // do it right now to block any new calls to Flush() while we're here
-    m_bHasMessages = FALSE;
-
-    // concatenate all strings (but not too many to not overfill the msg box)
-    wxString str;
-    size_t nLines = 0,
-    nMsgCount = m_aMessages.Count();
-
-    // start from the most recent message
-    for ( size_t n = nMsgCount; n > 0; n-- ) {
-        // for Windows strings longer than this value are wrapped (NT 4.0)
-        const size_t nMsgLineWidth = 156;
-
-        nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
-
-        if ( nLines > 25 )  // don't put too many lines in message box
-            break;
-
-        str << m_aMessages[n - 1] << _T("\n");
-    }
-
-    const wxChar *title;
-    long style;
-
-    if ( m_bErrors ) {
-        title = _("Error");
-        style = wxICON_STOP;
-    }
-    else if ( m_bWarnings ) {
-        title = _("Warning");
-        style = wxICON_EXCLAMATION;
-    }
-    else {
-        title = _("Information");
-        style = wxICON_INFORMATION;
-    }
-
-    wxMessageBox(str, title, wxOK | style);
-
-    // no undisplayed messages whatsoever
-    Clear();
-    
-    // do it here again
-    m_bHasMessages = FALSE;
-}
-
-// the default behaviour is to discard all informational messages if there
-// are any errors/warnings.
-void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
-{
-    switch ( level ) {
-        case wxLOG_Info:
-            if ( GetVerbose() )
-        case wxLOG_Message:
-                if ( !m_bErrors ) {
-                    m_aMessages.Add(szString);
-                    m_aTimes.Add((long)t);
-                    m_bHasMessages = TRUE;
-                }
-                break;
-
-        case wxLOG_Status:
-#if wxUSE_STATUSBAR
-                {
-                    // find the top window and set it's status text if it has any
-                    wxFrame *pFrame = gs_pFrame;
-                    if ( pFrame == NULL ) {
-                        wxWindow *pWin = wxTheApp->GetTopWindow();
-                        if ( pWin != NULL && pWin->IsKindOf(CLASSINFO(wxFrame)) ) {
-                            pFrame = (wxFrame *)pWin;
-                        }
-                    }
-
-                    if ( pFrame != NULL )
-                        pFrame->SetStatusText(szString);
-                }
-#endif // wxUSE_STATUSBAR
-                break;
-
-        case wxLOG_Trace:
-        case wxLOG_Debug:
-                #ifdef __WXDEBUG__
-                {
-                    #ifdef __WXMSW__
-                        // don't prepend debug/trace here: it goes to the
-                        // debug window anyhow, but do put a timestamp
-                        wxString str;
-                        TimeStamp(&str);
-                        str << szString << _T("\n\r");
-                        OutputDebugString(str);
-                    #else
-                        // send them to stderr
-                        wxFprintf(stderr, _T("%s: %s\n"),
-                                  level == wxLOG_Trace ? _T("Trace")
-                                                       : _T("Debug"),
-                                  szString);
-                        fflush(stderr);
-                    #endif
-                }
-                #endif // __WXDEBUG__
-
-                break;
-
-        case wxLOG_FatalError:
-                // show this one immediately
-                wxMessageBox(szString, _("Fatal error"), wxICON_HAND);
-                break;
-
-        case wxLOG_Error:
-                // discard earlier informational messages if this is the 1st
-                // error because they might not make sense any more
-                if ( !m_bErrors ) {
-                    m_aMessages.Empty();
-                    m_aTimes.Empty();
-                    m_bErrors = TRUE;
-                }
-                // fall through
-
-        case wxLOG_Warning:
-                if ( !m_bErrors ) {
-                    // for the warning we don't discard the info messages
-                    m_bWarnings = TRUE;
-                }
-
-                m_aMessages.Add(szString);
-                m_aTimes.Add((long)t);
-                m_bHasMessages = TRUE;
-                break;
-    }
-}
-
-// ----------------------------------------------------------------------------
-// wxLogWindow and wxLogFrame implementation
-// ----------------------------------------------------------------------------
-
-// log frame class
-// ---------------
-class wxLogFrame : public wxFrame
-{
-public:
-    // ctor & dtor
-    wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle);
-    virtual ~wxLogFrame();
-
-    // menu callbacks
-    void OnClose(wxCommandEvent& event);
-    void OnCloseWindow(wxCloseEvent& event);
-#if wxUSE_FILE
-    void OnSave (wxCommandEvent& event);
-#endif // wxUSE_FILE
-    void OnClear(wxCommandEvent& event);
-
-    void OnIdle(wxIdleEvent&);
-
-    // accessors
-    wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
-
-private:
-    enum
-    {
-        Menu_Close = 100,
-        Menu_Save,
-        Menu_Clear
-    };
-
-    // instead of closing just hide the window to be able to Show() it later
-    void DoClose() { Show(FALSE); }
-
-    wxTextCtrl  *m_pTextCtrl;
-    wxLogWindow *m_log;
-
-    DECLARE_EVENT_TABLE()
-};
-
-BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
-    // wxLogWindow menu events
-    EVT_MENU(Menu_Close, wxLogFrame::OnClose)
-#if wxUSE_FILE
-    EVT_MENU(Menu_Save,  wxLogFrame::OnSave)
-#endif // wxUSE_FILE
-    EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
-
-    EVT_CLOSE(wxLogFrame::OnCloseWindow)
-END_EVENT_TABLE()
-
-wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle)
-          : wxFrame(pParent, -1, szTitle)
-{
-    m_log = log;
-
-    m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
-            wxDefaultSize,
-            wxTE_MULTILINE  |
-            wxHSCROLL       |
-            wxTE_READONLY);
-
-    // create menu
-    wxMenuBar *pMenuBar = new wxMenuBar;
-    wxMenu *pMenu = new wxMenu;
-#if wxUSE_FILE
-    pMenu->Append(Menu_Save,  _("&Save..."), _("Save log contents to file"));
-#endif // wxUSE_FILE
-    pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents"));
-    pMenu->AppendSeparator();
-    pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
-    pMenuBar->Append(pMenu, _("&Log"));
-    SetMenuBar(pMenuBar);
-
-#if wxUSE_STATUSBAR
-    // status bar for menu prompts
-    CreateStatusBar();
-#endif // wxUSE_STATUSBAR
-
-    m_log->OnFrameCreate(this);
-}
-
-void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event))
-{
-    DoClose();
-}
-
-void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
-{
-    DoClose();
-}
-
-#if wxUSE_FILE
-void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
-{
-    // get the file name
-    // -----------------
-    const wxChar *szFileName = wxSaveFileSelector(_T("log"), _T("txt"), _T("log.txt"));
-    if ( szFileName == NULL ) {
-        // cancelled
-        return;
-    }
-
-    // open file
-    // ---------
-    wxFile file;
-    bool bOk = FALSE;
-    if ( wxFile::Exists(szFileName) ) {
-        bool bAppend = FALSE;
-        wxString strMsg;
-        strMsg.Printf(_("Append log to file '%s' "
-                    "(choosing [No] will overwrite it)?"), szFileName);
-        switch ( wxMessageBox(strMsg, _("Question"), wxYES_NO | wxCANCEL) ) {
-            case wxYES:
-                bAppend = TRUE;
-                break;
-
-            case wxNO:
-                bAppend = FALSE;
-                break;
-
-            case wxCANCEL:
-                return;
-
-            default:
-                wxFAIL_MSG(_("invalid message box return value"));
-        }
-
-        if ( bAppend ) {
-            bOk = file.Open(szFileName, wxFile::write_append);
-        }
-        else {
-            bOk = file.Create(szFileName, TRUE /* overwrite */);
-        }
-    }
-    else {
-        bOk = file.Create(szFileName);
-    }
-
-    // retrieve text and save it
-    // -------------------------
-    int nLines = m_pTextCtrl->GetNumberOfLines();
-    for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {
-        bOk = file.Write(m_pTextCtrl->GetLineText(nLine) +
-                // we're not going to pull in the whole wxTextFile if all we need is this...
-#if wxUSE_TEXTFILE
-                wxTextFile::GetEOL()
-#else // !wxUSE_TEXTFILE
-                '\n'
-#endif // wxUSE_TEXTFILE
-                        );
-    }
-
-    if ( bOk )
-        bOk = file.Close();
-
-    if ( !bOk ) {
-        wxLogError(_("Can't save log contents to file."));
-    }
-    else {
-        wxLogStatus(this, _("Log saved to the file '%s'."), szFileName);
-    }
-}
-#endif // wxUSE_FILE
-
-void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
-{
-    m_pTextCtrl->Clear();
-}
-
-wxLogFrame::~wxLogFrame()
-{
-    m_log->OnFrameDelete(this);
-}
-
-// wxLogWindow
-// -----------
-wxLogWindow::wxLogWindow(wxFrame *pParent,
-                         const wxChar *szTitle,
-                         bool bShow,
-                         bool bDoPass)
-{
-    m_bPassMessages = bDoPass;
-
-    m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
-    m_pOldLog = wxLog::SetActiveTarget(this);
-
-    if ( bShow )
-        m_pLogFrame->Show(TRUE);
-}
-
-void wxLogWindow::Show(bool bShow)
-{
-    m_pLogFrame->Show(bShow);
-}
-
-void wxLogWindow::Flush()
-{
-    if ( m_pOldLog != NULL )
-        m_pOldLog->Flush();
-
-    m_bHasMessages = FALSE;
-}
-
-void wxLogWindow::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
-{
-    // first let the previous logger show it
-    if ( m_pOldLog != NULL && m_bPassMessages ) {
-        // FIXME why can't we access protected wxLog method from here (we derive
-        //       from wxLog)? gcc gives "DoLog is protected in this context", what
-        //       does this mean? Anyhow, the cast is harmless and let's us do what
-        //       we want.
-        ((wxLogWindow *)m_pOldLog)->DoLog(level, szString, t);
-    }
-
-    if ( m_pLogFrame ) {
-        switch ( level ) {
-            case wxLOG_Status:
-                // by default, these messages are ignored by wxLog, so process
-                // them ourselves
-                if ( !wxIsEmpty(szString) )
-                {
-                    wxString str;
-                    str << _("Status: ") << szString;
-                    DoLogString(str, t);
-                }
-                break;
-
-                // don't put trace messages in the text window for 2 reasons:
-                // 1) there are too many of them
-                // 2) they may provoke other trace messages thus sending a program
-                //    into an infinite loop
-            case wxLOG_Trace:
-                break;
-
-            default:
-                // and this will format it nicely and call our DoLogString()
-                wxLog::DoLog(level, szString, t);
-        }
-    }
-
-    m_bHasMessages = TRUE;
-}
-
-void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
-{
-    // put the text into our window
-    wxTextCtrl *pText = m_pLogFrame->TextCtrl();
-
-    // remove selection (WriteText is in fact ReplaceSelection)
-#ifdef __WXMSW__
-    long nLen = pText->GetLastPosition();
-    pText->SetSelection(nLen, nLen);
-#endif // Windows
-
-    wxString msg;
-    TimeStamp(&msg);
-    msg << szString << _T('\n');
-
-    pText->AppendText(msg);
-
-    // TODO ensure that the line can be seen
-}
-
-wxFrame *wxLogWindow::GetFrame() const
-{
-    return m_pLogFrame;
-}
-
-void wxLogWindow::OnFrameCreate(wxFrame * WXUNUSED(frame))
-{
-}
-
-void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
-{
-    m_pLogFrame = (wxLogFrame *)NULL;
-}
-
-wxLogWindow::~wxLogWindow()
-{
-    delete m_pOldLog;
-
-    // may be NULL if log frame already auto destroyed itself
-    delete m_pLogFrame;
-}
-
-#endif  //wxUSE_NOGUI
-
 // ============================================================================
 // Global functions/variables
 // ============================================================================
@@ -1076,7 +586,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 
 #if wxUSE_NOGUI
         Trap();
-#else
+#else // GUI
         // this message is intentionally not translated - it is for
         // developpers only
         wxStrcat(szBuf, _T("\nDo you want to stop the program?"
@@ -1095,7 +605,7 @@ void wxOnAssert(const wxChar *szFile, int nLine, const wxChar *szMsg)
 
                 //case wxNO: nothing to do
         }
-#endif // USE_NOGUI
+#endif // !GUI/GUI
     }
 
     s_bInAssert = FALSE;
diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
new file mode 100644
index 0000000000..c3085720e5
--- /dev/null
+++ b/src/generic/logg.cpp
@@ -0,0 +1,542 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name:        logg.cpp
+// Purpose:     wxLog-derived classes which need GUI support (the rest is in
+//              src/common/log.cpp)
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     20.09.99 (extracted from src/common/log.cpp)
+// RCS-ID:      $Id$
+// Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
+// Licence:     wxWindows license
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+
+// no #pragma implementation "log.h" because it's already in src/common/log.cpp
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif
+
+#ifdef wxUSE_NOGUI
+    #error "This file can't be compiled in NOGUI mode!"
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/app.h"
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/menu.h"
+    #include "wx/frame.h"
+    #include "wx/filedlg.h"
+    #include "wx/msgdlg.h"
+    #include "wx/textctrl.h"
+#endif // WX_PRECOMP
+
+#include "wx/file.h"
+#include "wx/textfile.h"
+
+// ----------------------------------------------------------------------------
+// global variables
+// ----------------------------------------------------------------------------
+
+// we use a global variable to store the frame pointer for wxLogStatus - bad,
+// but it's he easiest way
+static wxFrame *gs_pFrame; // FIXME MT-unsafe
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// global functions
+// ----------------------------------------------------------------------------
+
+// accepts an additional argument which tells to which frame the output should
+// be directed
+void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
+{
+  wxString msg;
+
+  wxLog *pLog = wxLog::GetActiveTarget();
+  if ( pLog != NULL ) {
+    va_list argptr;
+    va_start(argptr, szFormat);
+    msg.PrintfV(szFormat, argptr);
+    va_end(argptr);
+
+    wxASSERT( gs_pFrame == NULL ); // should be reset!
+    gs_pFrame = pFrame;
+    wxLog::OnLog(wxLOG_Status, msg, time(NULL));
+    gs_pFrame = (wxFrame *) NULL;
+  }
+}
+
+// ----------------------------------------------------------------------------
+// wxLogTextCtrl implementation
+// ----------------------------------------------------------------------------
+
+wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
+{
+    m_pTextCtrl = pTextCtrl;
+}
+
+void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t t)
+{
+    wxString msg;
+    TimeStamp(&msg);
+    msg << szString << _T('\n');
+
+    m_pTextCtrl->AppendText(msg);
+}
+
+// ----------------------------------------------------------------------------
+// wxLogGui implementation (FIXME MT-unsafe)
+// ----------------------------------------------------------------------------
+
+wxLogGui::wxLogGui()
+{
+    Clear();
+}
+
+void wxLogGui::Clear()
+{
+    m_bErrors = m_bWarnings = FALSE;
+    m_aMessages.Empty();
+    m_aTimes.Empty();
+}
+
+void wxLogGui::Flush()
+{
+    if ( !m_bHasMessages )
+        return;
+
+    // do it right now to block any new calls to Flush() while we're here
+    m_bHasMessages = FALSE;
+
+    // concatenate all strings (but not too many to not overfill the msg box)
+    wxString str;
+    size_t nLines = 0,
+    nMsgCount = m_aMessages.Count();
+
+    // start from the most recent message
+    for ( size_t n = nMsgCount; n > 0; n-- ) {
+        // for Windows strings longer than this value are wrapped (NT 4.0)
+        const size_t nMsgLineWidth = 156;
+
+        nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
+
+        if ( nLines > 25 )  // don't put too many lines in message box
+            break;
+
+        str << m_aMessages[n - 1] << _T("\n");
+    }
+
+    const wxChar *title;
+    long style;
+
+    if ( m_bErrors ) {
+        title = _("Error");
+        style = wxICON_STOP;
+    }
+    else if ( m_bWarnings ) {
+        title = _("Warning");
+        style = wxICON_EXCLAMATION;
+    }
+    else {
+        title = _("Information");
+        style = wxICON_INFORMATION;
+    }
+
+    wxMessageBox(str, title, wxOK | style);
+
+    // no undisplayed messages whatsoever
+    Clear();
+    
+    // do it here again
+    m_bHasMessages = FALSE;
+}
+
+// the default behaviour is to discard all informational messages if there
+// are any errors/warnings.
+void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+{
+    switch ( level ) {
+        case wxLOG_Info:
+            if ( GetVerbose() )
+        case wxLOG_Message:
+                if ( !m_bErrors ) {
+                    m_aMessages.Add(szString);
+                    m_aTimes.Add((long)t);
+                    m_bHasMessages = TRUE;
+                }
+                break;
+
+        case wxLOG_Status:
+#if wxUSE_STATUSBAR
+                {
+                    // find the top window and set it's status text if it has any
+                    wxFrame *pFrame = gs_pFrame;
+                    if ( pFrame == NULL ) {
+                        wxWindow *pWin = wxTheApp->GetTopWindow();
+                        if ( pWin != NULL && pWin->IsKindOf(CLASSINFO(wxFrame)) ) {
+                            pFrame = (wxFrame *)pWin;
+                        }
+                    }
+
+                    if ( pFrame != NULL )
+                        pFrame->SetStatusText(szString);
+                }
+#endif // wxUSE_STATUSBAR
+                break;
+
+        case wxLOG_Trace:
+        case wxLOG_Debug:
+                #ifdef __WXDEBUG__
+                {
+                    #ifdef __WXMSW__
+                        // don't prepend debug/trace here: it goes to the
+                        // debug window anyhow, but do put a timestamp
+                        wxString str;
+                        TimeStamp(&str);
+                        str << szString << _T("\n\r");
+                        OutputDebugString(str);
+                    #else
+                        // send them to stderr
+                        wxFprintf(stderr, _T("%s: %s\n"),
+                                  level == wxLOG_Trace ? _T("Trace")
+                                                       : _T("Debug"),
+                                  szString);
+                        fflush(stderr);
+                    #endif
+                }
+                #endif // __WXDEBUG__
+
+                break;
+
+        case wxLOG_FatalError:
+                // show this one immediately
+                wxMessageBox(szString, _("Fatal error"), wxICON_HAND);
+                break;
+
+        case wxLOG_Error:
+                // discard earlier informational messages if this is the 1st
+                // error because they might not make sense any more
+                if ( !m_bErrors ) {
+                    m_aMessages.Empty();
+                    m_aTimes.Empty();
+                    m_bErrors = TRUE;
+                }
+                // fall through
+
+        case wxLOG_Warning:
+                if ( !m_bErrors ) {
+                    // for the warning we don't discard the info messages
+                    m_bWarnings = TRUE;
+                }
+
+                m_aMessages.Add(szString);
+                m_aTimes.Add((long)t);
+                m_bHasMessages = TRUE;
+                break;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// wxLogWindow and wxLogFrame implementation
+// ----------------------------------------------------------------------------
+
+// log frame class
+// ---------------
+class wxLogFrame : public wxFrame
+{
+public:
+    // ctor & dtor
+    wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle);
+    virtual ~wxLogFrame();
+
+    // menu callbacks
+    void OnClose(wxCommandEvent& event);
+    void OnCloseWindow(wxCloseEvent& event);
+#if wxUSE_FILE
+    void OnSave (wxCommandEvent& event);
+#endif // wxUSE_FILE
+    void OnClear(wxCommandEvent& event);
+
+    void OnIdle(wxIdleEvent&);
+
+    // accessors
+    wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
+
+private:
+    enum
+    {
+        Menu_Close = 100,
+        Menu_Save,
+        Menu_Clear
+    };
+
+    // instead of closing just hide the window to be able to Show() it later
+    void DoClose() { Show(FALSE); }
+
+    wxTextCtrl  *m_pTextCtrl;
+    wxLogWindow *m_log;
+
+    DECLARE_EVENT_TABLE()
+};
+
+BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
+    // wxLogWindow menu events
+    EVT_MENU(Menu_Close, wxLogFrame::OnClose)
+#if wxUSE_FILE
+    EVT_MENU(Menu_Save,  wxLogFrame::OnSave)
+#endif // wxUSE_FILE
+    EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
+
+    EVT_CLOSE(wxLogFrame::OnCloseWindow)
+END_EVENT_TABLE()
+
+wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle)
+          : wxFrame(pParent, -1, szTitle)
+{
+    m_log = log;
+
+    m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
+            wxDefaultSize,
+            wxTE_MULTILINE  |
+            wxHSCROLL       |
+            wxTE_READONLY);
+
+    // create menu
+    wxMenuBar *pMenuBar = new wxMenuBar;
+    wxMenu *pMenu = new wxMenu;
+#if wxUSE_FILE
+    pMenu->Append(Menu_Save,  _("&Save..."), _("Save log contents to file"));
+#endif // wxUSE_FILE
+    pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents"));
+    pMenu->AppendSeparator();
+    pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
+    pMenuBar->Append(pMenu, _("&Log"));
+    SetMenuBar(pMenuBar);
+
+#if wxUSE_STATUSBAR
+    // status bar for menu prompts
+    CreateStatusBar();
+#endif // wxUSE_STATUSBAR
+
+    m_log->OnFrameCreate(this);
+}
+
+void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event))
+{
+    DoClose();
+}
+
+void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
+{
+    DoClose();
+}
+
+#if wxUSE_FILE
+void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
+{
+    // get the file name
+    // -----------------
+    const wxChar *szFileName = wxSaveFileSelector(_T("log"), _T("txt"), _T("log.txt"));
+    if ( szFileName == NULL ) {
+        // cancelled
+        return;
+    }
+
+    // open file
+    // ---------
+    wxFile file;
+    bool bOk = FALSE;
+    if ( wxFile::Exists(szFileName) ) {
+        bool bAppend = FALSE;
+        wxString strMsg;
+        strMsg.Printf(_("Append log to file '%s' "
+                    "(choosing [No] will overwrite it)?"), szFileName);
+        switch ( wxMessageBox(strMsg, _("Question"), wxYES_NO | wxCANCEL) ) {
+            case wxYES:
+                bAppend = TRUE;
+                break;
+
+            case wxNO:
+                bAppend = FALSE;
+                break;
+
+            case wxCANCEL:
+                return;
+
+            default:
+                wxFAIL_MSG(_("invalid message box return value"));
+        }
+
+        if ( bAppend ) {
+            bOk = file.Open(szFileName, wxFile::write_append);
+        }
+        else {
+            bOk = file.Create(szFileName, TRUE /* overwrite */);
+        }
+    }
+    else {
+        bOk = file.Create(szFileName);
+    }
+
+    // retrieve text and save it
+    // -------------------------
+    int nLines = m_pTextCtrl->GetNumberOfLines();
+    for ( int nLine = 0; bOk && nLine < nLines; nLine++ ) {
+        bOk = file.Write(m_pTextCtrl->GetLineText(nLine) +
+                // we're not going to pull in the whole wxTextFile if all we need is this...
+#if wxUSE_TEXTFILE
+                wxTextFile::GetEOL()
+#else // !wxUSE_TEXTFILE
+                '\n'
+#endif // wxUSE_TEXTFILE
+                        );
+    }
+
+    if ( bOk )
+        bOk = file.Close();
+
+    if ( !bOk ) {
+        wxLogError(_("Can't save log contents to file."));
+    }
+    else {
+        wxLogStatus(this, _("Log saved to the file '%s'."), szFileName);
+    }
+}
+#endif // wxUSE_FILE
+
+void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
+{
+    m_pTextCtrl->Clear();
+}
+
+wxLogFrame::~wxLogFrame()
+{
+    m_log->OnFrameDelete(this);
+}
+
+// wxLogWindow
+// -----------
+wxLogWindow::wxLogWindow(wxFrame *pParent,
+                         const wxChar *szTitle,
+                         bool bShow,
+                         bool bDoPass)
+{
+    m_bPassMessages = bDoPass;
+
+    m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
+    m_pOldLog = wxLog::SetActiveTarget(this);
+
+    if ( bShow )
+        m_pLogFrame->Show(TRUE);
+}
+
+void wxLogWindow::Show(bool bShow)
+{
+    m_pLogFrame->Show(bShow);
+}
+
+void wxLogWindow::Flush()
+{
+    if ( m_pOldLog != NULL )
+        m_pOldLog->Flush();
+
+    m_bHasMessages = FALSE;
+}
+
+void wxLogWindow::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+{
+    // first let the previous logger show it
+    if ( m_pOldLog != NULL && m_bPassMessages ) {
+        // FIXME why can't we access protected wxLog method from here (we derive
+        //       from wxLog)? gcc gives "DoLog is protected in this context", what
+        //       does this mean? Anyhow, the cast is harmless and let's us do what
+        //       we want.
+        ((wxLogWindow *)m_pOldLog)->DoLog(level, szString, t);
+    }
+
+    if ( m_pLogFrame ) {
+        switch ( level ) {
+            case wxLOG_Status:
+                // by default, these messages are ignored by wxLog, so process
+                // them ourselves
+                if ( !wxIsEmpty(szString) )
+                {
+                    wxString str;
+                    str << _("Status: ") << szString;
+                    DoLogString(str, t);
+                }
+                break;
+
+                // don't put trace messages in the text window for 2 reasons:
+                // 1) there are too many of them
+                // 2) they may provoke other trace messages thus sending a program
+                //    into an infinite loop
+            case wxLOG_Trace:
+                break;
+
+            default:
+                // and this will format it nicely and call our DoLogString()
+                wxLog::DoLog(level, szString, t);
+        }
+    }
+
+    m_bHasMessages = TRUE;
+}
+
+void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+{
+    // put the text into our window
+    wxTextCtrl *pText = m_pLogFrame->TextCtrl();
+
+    // remove selection (WriteText is in fact ReplaceSelection)
+#ifdef __WXMSW__
+    long nLen = pText->GetLastPosition();
+    pText->SetSelection(nLen, nLen);
+#endif // Windows
+
+    wxString msg;
+    TimeStamp(&msg);
+    msg << szString << _T('\n');
+
+    pText->AppendText(msg);
+
+    // TODO ensure that the line can be seen
+}
+
+wxFrame *wxLogWindow::GetFrame() const
+{
+    return m_pLogFrame;
+}
+
+void wxLogWindow::OnFrameCreate(wxFrame * WXUNUSED(frame))
+{
+}
+
+void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
+{
+    m_pLogFrame = (wxLogFrame *)NULL;
+}
+
+wxLogWindow::~wxLogWindow()
+{
+    delete m_pOldLog;
+
+    // may be NULL if log frame already auto destroyed itself
+    delete m_pLogFrame;
+}
+
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 3f39afcacc..6f198e6b39 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 19:22, 1999/09/18
+# This file was automatically generated by tmake at 17:51, 1999/09/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -80,6 +80,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 		$(MSWDIR)\choicdgg.obj \
 		$(MSWDIR)\gridg.obj \
 		$(MSWDIR)\laywin.obj \
+		$(MSWDIR)\logg.obj \
 		$(MSWDIR)\numdlgg.obj \
 		$(MSWDIR)\panelg.obj \
 		$(MSWDIR)\progdlgg.obj \
@@ -703,6 +704,8 @@ $(MSWDIR)\gridg.obj: $(GENDIR)\gridg.$(SRCSUFF)
 
 $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
+$(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
+
 $(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
 
 $(MSWDIR)\panelg.obj: $(GENDIR)\panelg.$(SRCSUFF)
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 18c5d1b099..8803697729 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 19:22, 1999/09/18
+# This file was automatically generated by tmake at 17:51, 1999/09/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -80,6 +80,7 @@ GENERICOBJS= $(MSWDIR)\busyinfo.obj \
 		$(MSWDIR)\imaglist.obj \
 		$(MSWDIR)\laywin.obj \
 		$(MSWDIR)\listctrl.obj \
+		$(MSWDIR)\logg.obj \
 		$(MSWDIR)\notebook.obj \
 		$(MSWDIR)\numdlgg.obj \
 		$(MSWDIR)\panelg.obj \
@@ -587,6 +588,8 @@ $(MSWDIR)\laywin.obj: $(GENDIR)\laywin.$(SRCSUFF)
 
 $(MSWDIR)\listctrl.obj: $(GENDIR)\listctrl.$(SRCSUFF)
 
+$(MSWDIR)\logg.obj: $(GENDIR)\logg.$(SRCSUFF)
+
 $(MSWDIR)\notebook.obj: $(GENDIR)\notebook.$(SRCSUFF)
 
 $(MSWDIR)\numdlgg.obj: $(GENDIR)\numdlgg.$(SRCSUFF)
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index b6d6f52edb..0f533bb882 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 19:22, 1999/09/18
+# This file was automatically generated by tmake at 17:51, 1999/09/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -66,6 +66,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\imaglist.obj \
 		$(GENDIR)\laywin.obj \
 		$(GENDIR)\listctrl.obj \
+		$(GENDIR)\logg.obj \
 		$(GENDIR)\notebook.obj \
 		$(GENDIR)\numdlgg.obj \
 		$(GENDIR)\panelg.obj \
@@ -1053,6 +1054,11 @@ $(GENDIR)/listctrl.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/logg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/notebook.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 8376cf430e..28e60757e5 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,5 +1,5 @@
 
-# This file was automatically generated by tmake at 19:22, 1999/09/18
+# This file was automatically generated by tmake at 17:51, 1999/09/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -42,6 +42,7 @@ GENERICOBJS = \
 		$(GENDIR)/dirdlgg.$(OBJSUFF) \
 		$(GENDIR)/gridg.$(OBJSUFF) \
 		$(GENDIR)/laywin.$(OBJSUFF) \
+		$(GENDIR)/logg.$(OBJSUFF) \
 		$(GENDIR)/numdlgg.$(OBJSUFF) \
 		$(GENDIR)/panelg.$(OBJSUFF) \
 		$(GENDIR)/progdlgg.$(OBJSUFF) \
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 9c1a19a4ac..9749bb4efe 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 19:22, 1999/09/18
+# This file was automatically generated by tmake at 17:51, 1999/09/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -30,6 +30,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\choicdgg.obj \
 		$(GENDIR)\gridg.obj \
 		$(GENDIR)\laywin.obj \
+		$(GENDIR)\logg.obj \
 		$(GENDIR)\numdlgg.obj \
 		$(GENDIR)\panelg.obj \
 		$(GENDIR)\progdlgg.obj \
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 6c8dbcbb98..ac2e1489cf 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 19:22, 1999/09/18
+# This file was automatically generated by tmake at 17:51, 1999/09/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -87,6 +87,7 @@ GENERICOBJS= ..\generic\$D\busyinfo.obj \
 		..\generic\$D\choicdgg.obj \
 		..\generic\$D\gridg.obj \
 		..\generic\$D\laywin.obj \
+		..\generic\$D\logg.obj \
 		..\generic\$D\numdlgg.obj \
 		..\generic\$D\panelg.obj \
 		..\generic\$D\progdlgg.obj \
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 65f2bf10b9..eaac121a91 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 19:22, 1999/09/18
+# This file was automatically generated by tmake at 17:51, 1999/09/20
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #!/binb/wmake.exe
@@ -36,6 +36,7 @@ GENERICOBJS= busyinfo.obj &
 	choicdgg.obj &
 	gridg.obj &
 	laywin.obj &
+	logg.obj &
 	numdlgg.obj &
 	panelg.obj &
 	progdlgg.obj &
@@ -830,6 +831,9 @@ gridg.obj:     $(GENDIR)\gridg.cpp
 laywin.obj:     $(GENDIR)\laywin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+logg.obj:     $(GENDIR)\logg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 numdlgg.obj:     $(GENDIR)\numdlgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-- 
2.47.2