X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/224ff7a50ddb527dfacda6a40a77afb086bdd11e..1a0d517ea4dbcef61ba9b0868318f686e97618bb:/src/generic/logg.cpp

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index b0c80bea5c..a27b1945a1 100644
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -33,6 +33,7 @@
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
+    #include "wx/button.h"
     #include "wx/intl.h"
     #include "wx/log.h"
     #include "wx/menu.h"
@@ -42,10 +43,14 @@
     #include "wx/textctrl.h"
     #include "wx/sizer.h"
     #include "wx/statbmp.h"
+    #include "wx/button.h"
 #endif // WX_PRECOMP
 
+#if wxUSE_LOGGUI || wxUSE_LOGWINDOW
+
 #include "wx/file.h"
 #include "wx/textfile.h"
+#include "wx/statline.h"
 
 #ifdef  __WXMSW__
   // for OutputDebugString()
@@ -53,12 +58,15 @@
 #endif // Windows
 
 // may be defined to 0 for old behavior (using wxMessageBox) - shouldn't be
-// changed normally (that's why it's here and not in setup.h)
+// changed normally (that's why it's here and not in setup.h).
+// Actually it now is in setup.h.
+#ifndef wxUSE_LOG_DIALOG
 #define wxUSE_LOG_DIALOG 1
+#endif
 
 #if wxUSE_LOG_DIALOG
-    #include "wx/datetime.h"
     #include "wx/listctrl.h"
+    #include "wx/imaglist.h"
     #include "wx/image.h"
 #else // !wxUSE_TEXTFILE
     #include "wx/msgdlg.h"
@@ -70,6 +78,20 @@
 
 #if wxUSE_LOG_DIALOG
 
+// this function is a wrapper around strftime(3)
+// allows to exclude the usage of wxDateTime
+static wxString TimeStamp(const wxChar *format, time_t t)
+{
+    wxChar buf[4096];
+    if ( !wxStrftime(buf, WXSIZEOF(buf), format, localtime(&t)) )
+    {
+        // buffer is too small?
+        wxFAIL_MSG(_T("strftime() failed"));
+    }
+    return wxString(buf);
+}
+
+
 class wxLogDialog : public wxDialog
 {
 public:
@@ -84,8 +106,15 @@ public:
     // event handlers
     void OnOk(wxCommandEvent& event);
     void OnDetails(wxCommandEvent& event);
+#if wxUSE_FILE
+    void OnSave(wxCommandEvent& event);
+#endif // wxUSE_FILE
+    void OnListSelect(wxListEvent& event);
 
 private:
+    // create controls needed for the details display
+    void CreateDetailsControls();
+
     // the data for the listctrl
     wxArrayString m_messages;
     wxArrayInt m_severity;
@@ -95,25 +124,53 @@ private:
     wxButton *m_btnDetails;
     bool      m_showingDetails;
 
-    // the listctrl (not shown initially)
+    // the controls which are not shown initially (but only when details
+    // button is pressed)
     wxListCtrl *m_listctrl;
+#if wxUSE_STATLINE
+    wxStaticLine *m_statline;
+#endif // wxUSE_STATLINE
+#if wxUSE_FILE
+    wxButton *m_btnSave;
+#endif // wxUSE_FILE
+
+    // the translated "Details" string
+    static wxString ms_details;
 
     DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
-    EVT_BUTTON(wxID_OK,     wxLogDialog::OnOk)
+    EVT_BUTTON(wxID_CANCEL, wxLogDialog::OnOk)
     EVT_BUTTON(wxID_MORE,   wxLogDialog::OnDetails)
+#if wxUSE_FILE
+    EVT_BUTTON(wxID_SAVE,   wxLogDialog::OnSave)
+#endif // wxUSE_FILE
+    EVT_LIST_ITEM_SELECTED(-1, wxLogDialog::OnListSelect)
 END_EVENT_TABLE()
 
 #endif // wxUSE_LOG_DIALOG
 
+// ----------------------------------------------------------------------------
+// private functions
+// ----------------------------------------------------------------------------
+
+#if wxUSE_FILE && wxUSE_FILEDLG
+
+// pass an uninitialized file object, the function will ask the user for the
+// filename and try to open it, returns TRUE on success (file was opened),
+// FALSE if file couldn't be opened/created and -1 if the file selection
+// dialog was cancelled
+static int OpenLogFile(wxFile& file, wxString *filename = NULL);
+
+#endif // wxUSE_FILE
+
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 
 // we use a global variable to store the frame pointer for wxLogStatus - bad,
-// but it's he easiest way
+// but it's the easiest way
 static wxFrame *gs_pFrame; // FIXME MT-unsafe
 
 // ============================================================================
@@ -144,24 +201,6 @@ void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
   }
 }
 
-// ----------------------------------------------------------------------------
-// wxLogTextCtrl implementation
-// ----------------------------------------------------------------------------
-
-wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
-{
-    m_pTextCtrl = pTextCtrl;
-}
-
-void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
-{
-    wxString msg;
-    TimeStamp(&msg);
-    msg << szString << wxT('\n');
-
-    m_pTextCtrl->AppendText(msg);
-}
-
 // ----------------------------------------------------------------------------
 // wxLogGui implementation (FIXME MT-unsafe)
 // ----------------------------------------------------------------------------
@@ -173,7 +212,10 @@ wxLogGui::wxLogGui()
 
 void wxLogGui::Clear()
 {
-    m_bErrors = m_bWarnings = FALSE;
+    m_bErrors =
+    m_bWarnings =
+    m_bHasMessages = FALSE;
+
     m_aMessages.Empty();
     m_aSeverity.Empty();
     m_aTimes.Empty();
@@ -187,69 +229,82 @@ void wxLogGui::Flush()
     // do it right now to block any new calls to Flush() while we're here
     m_bHasMessages = FALSE;
 
-    wxString title = wxTheApp->GetAppName();
-    if ( !!title )
-    {
-        title[0u] = wxToupper(title[0u]);
-        title += _T(' ');
-    }
+    wxString appName = wxTheApp->GetAppName();
+    if ( !!appName )
+        appName[0u] = wxToupper(appName[0u]);
 
     long style;
+    wxString titleFormat;
     if ( m_bErrors ) {
-        title += _("Error");
+        titleFormat = _("%s Error");
         style = wxICON_STOP;
     }
     else if ( m_bWarnings ) {
-        title += _("Warning");
+        titleFormat = _("%s Warning");
         style = wxICON_EXCLAMATION;
     }
     else {
-        title += _("Information");
+        titleFormat = _("%s Information");
         style = wxICON_INFORMATION;
     }
 
-#if wxUSE_LOG_DIALOG
-    wxLogDialog dlg(wxTheApp->GetTopWindow(),
-                    m_aMessages, m_aSeverity, m_aTimes,
-                    title, style);
+    wxString title;
+    title.Printf(titleFormat, appName.c_str());
 
-    // clear the message list before showing the dialog because while it's
-    // shown some new messages may appear
-    Clear();
+    // this is the best we can do here
+    wxWindow *parent = wxTheApp->GetTopWindow();
 
-    (void)dlg.ShowModal();
+    size_t nMsgCount = m_aMessages.Count();
 
-#else // !wxUSE_LOG_DIALOG
-    // concatenate all strings (but not too many to not overfill the msg box)
     wxString str;
-    size_t nLines = 0,
-    nMsgCount = m_aMessages.Count();
+    if ( nMsgCount == 1 )
+    {
+        str = m_aMessages[0];
+    }
+    else // more than one message
+    {
+#if wxUSE_LOG_DIALOG
 
-    // 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;
+        wxLogDialog dlg(parent,
+                        m_aMessages, m_aSeverity, m_aTimes,
+                        title, style);
 
-        nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
+        // clear the message list before showing the dialog because while it's
+        // shown some new messages may appear
+        Clear();
 
-        if ( nLines > 25 )  // don't put too many lines in message box
-            break;
+        (void)dlg.ShowModal();
+#else // !wxUSE_LOG_DIALOG
+        // concatenate all strings (but not too many to not overfill the msg box)
+        size_t nLines = 0;
 
-        str << m_aMessages[n - 1] << wxT("\n");
-    }
+        // 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;
 
-    wxMessageBox(str, title, wxOK | style);
+            nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
 
-    // no undisplayed messages whatsoever
-    Clear();
+            if ( nLines > 25 )  // don't put too many lines in message box
+                break;
+
+            str << m_aMessages[n - 1] << wxT("\n");
+        }
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
+    }
 
-    // do it here again
-    m_bHasMessages = FALSE;
+    // this catches both cases of 1 message with wxUSE_LOG_DIALOG and any
+    // situation without it
+    if ( !!str )
+    {
+        wxMessageBox(str, title, wxOK | style, parent);
+
+        // no undisplayed messages whatsoever
+        Clear();
+    }
 }
 
-// the default behaviour is to discard all informational messages if there
-// are any errors/warnings.
+// log all kinds of messages
 void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
 {
     switch ( level ) {
@@ -288,12 +343,12 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
         case wxLOG_Debug:
             #ifdef __WXDEBUG__
             {
-                #ifdef __WXMSW__
+                #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
                     // don't prepend debug/trace here: it goes to the
                     // debug window anyhow, but do put a timestamp
                     wxString str;
                     TimeStamp(&str);
-                    str << szString << wxT("\n\r");
+                    str << szString << wxT("\r\n");
                     OutputDebugString(str);
                 #else
                     // send them to stderr
@@ -311,6 +366,7 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
         case wxLOG_FatalError:
             // show this one immediately
             wxMessageBox(szString, _("Fatal error"), wxICON_HAND);
+            wxExit();
             break;
 
         case wxLOG_Error:
@@ -334,7 +390,7 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
             }
 
             m_aMessages.Add(szString);
-            m_aSeverity.Add(level);
+            m_aSeverity.Add((int)level);
             m_aTimes.Add((long)t);
             m_bHasMessages = TRUE;
             break;
@@ -368,15 +424,16 @@ public:
     wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
 
 private:
+    // use standard ids for our commands!
     enum
     {
-        Menu_Close = 100,
-        Menu_Save,
-        Menu_Clear
+        Menu_Close = wxID_CLOSE,
+        Menu_Save  = wxID_SAVE,
+        Menu_Clear = wxID_CLEAR
     };
 
-    // instead of closing just hide the window to be able to Show() it later
-    void DoClose() { Show(FALSE); }
+    // common part of OnClose() and OnCloseWindow()
+    void DoClose();
 
     wxTextCtrl  *m_pTextCtrl;
     wxLogWindow *m_log;
@@ -406,6 +463,7 @@ wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle
             wxHSCROLL       |
             wxTE_READONLY);
 
+#if wxUSE_MENUS
     // create menu
     wxMenuBar *pMenuBar = new wxMenuBar;
     wxMenu *pMenu = new wxMenu;
@@ -417,6 +475,7 @@ wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle
     pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
     pMenuBar->Append(pMenu, _("&Log"));
     SetMenuBar(pMenuBar);
+#endif // wxUSE_MENUS
 
 #if wxUSE_STATUSBAR
     // status bar for menu prompts
@@ -426,6 +485,16 @@ wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle
     m_log->OnFrameCreate(this);
 }
 
+void wxLogFrame::DoClose()
+{
+    if ( m_log->OnFrameClose(this) )
+    {
+        // instead of closing just hide the window to be able to Show() it
+        // later
+        Show(FALSE);
+    }
+}
+
 void wxLogFrame::OnClose(wxCommandEvent& WXUNUSED(event))
 {
     DoClose();
@@ -439,62 +508,24 @@ void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
 #if wxUSE_FILE
 void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 {
-    // get the file name
-    // -----------------
-    const wxChar *szFileName = wxSaveFileSelector(wxT("log"), wxT("txt"), wxT("log.txt"));
-    if ( szFileName == NULL ) {
+#if wxUSE_FILEDLG
+    wxString filename;
+    wxFile file;
+    int rc = OpenLogFile(file, &filename);
+    if ( rc == -1 )
+    {
         // 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);
-    }
+    bool bOk = rc != 0;
 
     // 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
-                        );
+                         wxTextFile::GetEOL());
     }
 
     if ( bOk )
@@ -504,8 +535,9 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
         wxLogError(_("Can't save log contents to file."));
     }
     else {
-        wxLogStatus(this, _("Log saved to the file '%s'."), szFileName);
+        wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str());
     }
+#endif
 }
 #endif // wxUSE_FILE
 
@@ -614,6 +646,12 @@ void wxLogWindow::OnFrameCreate(wxFrame * WXUNUSED(frame))
 {
 }
 
+bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame))
+{
+    // allow to close
+    return TRUE;
+}
+
 void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
 {
     m_pLogFrame = (wxLogFrame *)NULL;
@@ -635,18 +673,54 @@ wxLogWindow::~wxLogWindow()
 
 static const size_t MARGIN = 10;
 
+wxString wxLogDialog::ms_details;
+
 wxLogDialog::wxLogDialog(wxWindow *parent,
                          const wxArrayString& messages,
                          const wxArrayInt& severity,
                          const wxArrayLong& times,
                          const wxString& caption,
                          long style)
-           : wxDialog(parent, -1, caption ),
-             m_messages(messages), m_severity(severity), m_times(times)
+           : wxDialog(parent, -1, caption)
 {
+    if ( ms_details.IsEmpty() )
+    {
+        // ensure that we won't loop here if wxGetTranslation()
+        // happens to pop up a Log message while translating this :-)
+        ms_details = wxTRANSLATE("&Details");
+        ms_details = wxGetTranslation(ms_details);
+    }
+
+    size_t count = messages.GetCount();
+    m_messages.Alloc(count);
+    m_severity.Alloc(count);
+    m_times.Alloc(count);
+
+    for ( size_t n = 0; n < count; n++ )
+    {
+        wxString msg = messages[n];
+        do
+        {
+            m_messages.Add(msg.BeforeFirst(_T('\n')));
+            msg = msg.AfterFirst(_T('\n'));
+
+            m_severity.Add(severity[n]);
+            m_times.Add(times[n]);
+        }
+        while ( !!msg );
+    }
+
     m_showingDetails = FALSE; // not initially
     m_listctrl = (wxListCtrl *)NULL;
 
+#if wxUSE_STATLINE
+    m_statline = (wxStaticLine *)NULL;
+#endif // wxUSE_STATLINE
+
+#if wxUSE_FILE
+    m_btnSave = (wxButton *)NULL;
+#endif // wxUSE_FILE
+
     // create the controls which are always shown and layout them: we use
     // sizers even though our window is not resizeable to calculate the size of
     // the dialog properly
@@ -654,13 +728,19 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     wxBoxSizer *sizerButtons = new wxBoxSizer(wxVERTICAL);
     wxBoxSizer *sizerAll = new wxBoxSizer(wxHORIZONTAL);
 
-    wxButton *btnOk = new wxButton(this, wxID_OK, _T("Ok"));
+    // this "Ok" button has wxID_CANCEL id - not very logical, but this allows
+    // to close the log dialog with <Esc> which wouldn't work otherwise (as it
+    // translates into click on cancel button)
+    wxButton *btnOk = new wxButton(this, wxID_CANCEL, _("OK"));
     sizerButtons->Add(btnOk, 0, wxCENTRE|wxBOTTOM, MARGIN/2);
-    m_btnDetails = new wxButton(this, wxID_MORE, _T("&Details >>"));
+    m_btnDetails = new wxButton(this, wxID_MORE, ms_details + _T(" >>"));
     sizerButtons->Add(m_btnDetails, 0, wxCENTRE|wxTOP, MARGIN/2 - 1);
 
-    wxIcon icon = wxTheApp->GetStdIcon(style & wxICON_MASK);
+#ifndef __WIN16__
+    wxIcon icon = wxTheApp->GetStdIcon((int)(style & wxICON_MASK));
     sizerAll->Add(new wxStaticBitmap(this, -1, icon), 0, wxCENTRE);
+#endif // !Win16
+
     const wxString& message = messages.Last();
     sizerAll->Add(CreateTextSizer(message), 0, wxCENTRE|wxLEFT|wxRIGHT, MARGIN);
     sizerAll->Add(sizerButtons, 0, wxALIGN_RIGHT|wxLEFT, MARGIN);
@@ -675,115 +755,224 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
 
     btnOk->SetFocus();
 
-    if ( m_messages.GetCount() == 1 )
+    // this can't happen any more as we don't use this dialog in this case
+#if 0
+    if ( count == 1 )
     {
         // no details... it's easier to disable a button than to change the
         // dialog layout depending on whether we have details or not
         m_btnDetails->Disable();
     }
+#endif // 0
 
     Centre();
 }
 
+void wxLogDialog::CreateDetailsControls()
+{
+    // create the save button and separator line if possible
+#if wxUSE_FILE
+    m_btnSave = new wxButton(this, wxID_SAVE, _("&Save..."));
+#endif // wxUSE_FILE
+
+#if wxUSE_STATLINE
+    m_statline = new wxStaticLine(this, -1);
+#endif // wxUSE_STATLINE
+
+    // create the list ctrl now
+    m_listctrl = new wxListCtrl(this, -1,
+                                wxDefaultPosition, wxDefaultSize,
+                                wxSUNKEN_BORDER |
+                                wxLC_REPORT |
+                                wxLC_NO_HEADER |
+                                wxLC_SINGLE_SEL);
+
+    // no need to translate these strings as they're not shown to the
+    // user anyhow (we use wxLC_NO_HEADER style)
+    m_listctrl->InsertColumn(0, _T("Message"));
+    m_listctrl->InsertColumn(1, _T("Time"));
+
+    // prepare the imagelist
+    static const int ICON_SIZE = 16;
+    wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
+
+    // order should be the same as in the switch below!
+    static const int icons[] =
+    {
+        wxICON_ERROR,
+        wxICON_EXCLAMATION,
+        wxICON_INFORMATION
+    };
+
+    bool loadedIcons = TRUE;
+
+#ifndef __WIN16__
+    for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
+    {
+        wxBitmap bmp = wxTheApp->GetStdIcon(icons[icon]);
+
+        // This may very well fail if there are insufficient
+        // colours available. Degrade gracefully.
+
+        if (!bmp.Ok())
+            loadedIcons = FALSE;
+        else
+            imageList->Add(wxImage(bmp).
+                        Rescale(ICON_SIZE, ICON_SIZE).
+                         ConvertToBitmap());
+    }
+
+    m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
+#endif // !Win16
+
+    // and fill it
+    wxString fmt = wxLog::GetTimestamp();
+    if ( !fmt )
+    {
+        // default format
+        fmt = _T("%c");
+    }
+
+    size_t count = m_messages.GetCount();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        int image = -1;
+#ifndef __WIN16__
+        switch ( m_severity[n] )
+        {
+            case wxLOG_Error:
+                image = 0;
+                break;
+
+            case wxLOG_Warning:
+                image = 1;
+                break;
+
+            default:
+                image = 2;
+        }
+#endif // !Win16
+
+        if (!loadedIcons)
+            image = -1;
+
+        if (image > -1)
+            m_listctrl->InsertItem(n, m_messages[n], image);
+        else
+            m_listctrl->InsertItem(n, m_messages[n]);
+
+        m_listctrl->SetItem(n, 1,
+                            TimeStamp(fmt, (time_t)m_times[n]));
+    }
+
+    // let the columns size themselves
+    m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE);
+    m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE);
+
+    // get the approx height of the listctrl
+    wxFont font = GetFont();
+    if ( !font.Ok() )
+        font = *wxSWISS_FONT;
+
+    int y;
+    GetTextExtent(_T("H"), (int*)NULL, &y, (int*)NULL, (int*)NULL, &font);
+    int height = wxMax(y*(count + 3), 100);
+    m_listctrl->SetSize(-1, height);
+}
+
+void wxLogDialog::OnListSelect(wxListEvent& event)
+{
+    // we can't just disable the control because this looks ugly under Windows
+    // (wrong bg colour, no scrolling...), but we still want to disable
+    // selecting items - it makes no sense here
+    m_listctrl->SetItemState(event.GetIndex(), 0, wxLIST_STATE_SELECTED);
+}
+
 void wxLogDialog::OnOk(wxCommandEvent& WXUNUSED(event))
 {
     EndModal(wxID_OK);
 }
 
-void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
-{
-    wxSizer *sizer = GetSizer();
+#if wxUSE_FILE
 
-    if ( m_showingDetails )
+void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
+{
+#if wxUSE_FILEDLG
+    wxFile file;
+    int rc = OpenLogFile(file);
+    if ( rc == -1 )
     {
-        m_btnDetails->SetLabel(_T("&Details >>"));
-
-        sizer->Remove(m_listctrl);
+        // cancelled
+        return;
     }
-    else // show details now
+
+    bool ok = rc != 0;
+
+    wxString fmt = wxLog::GetTimestamp();
+    if ( !fmt )
     {
-        m_btnDetails->SetLabel(_T("<< &Details"));
+        // default format
+        fmt = _T("%c");
+    }
 
-        if ( !m_listctrl )
-        {
-            // create it now
-            m_listctrl = new wxListCtrl(this, -1,
-                                        wxDefaultPosition, wxDefaultSize,
-                                        wxSUNKEN_BORDER |
-                                        wxLC_REPORT |
-                                        wxLC_NO_HEADER );
-            m_listctrl->InsertColumn(0, _("Message"));
-            m_listctrl->InsertColumn(1, _("Time"));
-
-            // prepare the imagelist
-            static const int ICON_SIZE = 16;
-            wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
-
-            // order should be the same as in the switch below!
-            static const int icons[] =
-            {
-                wxICON_ERROR,
-                wxICON_EXCLAMATION,
-                wxICON_INFORMATION
-            };
+    size_t count = m_messages.GetCount();
+    for ( size_t n = 0; ok && (n < count); n++ )
+    {
+        wxString line;
+        line << TimeStamp(fmt, (time_t)m_times[n])
+             << _T(": ")
+             << m_messages[n]
+             << wxTextFile::GetEOL();
 
-            for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
-            {
-                wxBitmap bmp = wxTheApp->GetStdIcon(icons[icon]);
-                imageList->Add(wxImage(bmp).
-                                Rescale(ICON_SIZE, ICON_SIZE).
-                                 ConvertToBitmap());
-            }
+        ok = file.Write(line);
+    }
 
-            m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
+    if ( ok )
+        ok = file.Close();
 
-            // and fill it
-            wxString fmt = wxLog::GetTimestamp();
-            if ( !fmt )
-            {
-                // default format
-                fmt = _T("%X");
-            }
+    if ( !ok )
+        wxLogError(_("Can't save log contents to file."));
+#endif
+}
 
-            size_t count = m_messages.GetCount();
-            for ( size_t n = 0; n < count; n++ )
-            {
-                int image;
-                switch ( m_severity[n] )
-                {
-                    case wxLOG_Error:
-                        image = 0;
-                        break;
+#endif // wxUSE_FILE
 
-                    case wxLOG_Warning:
-                        image = 1;
-                        break;
+void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
+{
+    wxSizer *sizer = GetSizer();
 
-                    default:
-                        image = 2;
-                }
+    if ( m_showingDetails )
+    {
+        m_btnDetails->SetLabel(ms_details + _T(">>"));
 
-                m_listctrl->InsertItem(n, m_messages[n], image);
-                m_listctrl->SetItem(n, 1,
-                                    wxDateTime((time_t)m_times[n]).Format(fmt));
-            }
+        sizer->Remove(m_listctrl);
 
-            // let the columns size themselves
-            m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE);
-            m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE);
+#if wxUSE_STATLINE
+        sizer->Remove(m_statline);
+#endif // wxUSE_STATLINE
 
-            // get the approx height of the listctrl
-            wxFont font = GetFont();
-            if ( !font.Ok() )
-                font = *wxSWISS_FONT;
+#if wxUSE_FILE
+        sizer->Remove(m_btnSave);
+#endif // wxUSE_FILE
+    }
+    else // show details now
+    {
+        m_btnDetails->SetLabel(wxString(_T("<< ")) + ms_details);
 
-            int y;
-            GetTextExtent(_T("H"), (int*)NULL, &y, (int*)NULL, (int*)NULL, &font);
-            int height = wxMin(y*(count + 3), 100);
-            m_listctrl->SetSize(-1, height);
+        if ( !m_listctrl )
+        {
+            CreateDetailsControls();
         }
 
-        sizer->Add(m_listctrl, 1, wxEXPAND|(wxALL & ~wxTOP), MARGIN);
+#if wxUSE_STATLINE
+        sizer->Add(m_statline, 0, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
+#endif // wxUSE_STATLINE
+
+        sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
+
+#if wxUSE_FILE
+        sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN);
+#endif // wxUSE_FILE
     }
 
     m_showingDetails = !m_showingDetails;
@@ -791,6 +980,13 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
     // in any case, our size changed - update
     sizer->SetSizeHints(this);
     sizer->Fit(this);
+
+#ifdef __WXGTK__
+    // VS: this is neccessary in order to force frame redraw under
+    // WindowMaker or fvwm2 (and probably other broken WMs).
+    // Otherwise, detailed list wouldn't be displayed.
+    Show(TRUE);
+#endif // wxGTK
 }
 
 wxLogDialog::~wxLogDialog()
@@ -802,3 +998,95 @@ wxLogDialog::~wxLogDialog()
 }
 
 #endif // wxUSE_LOG_DIALOG
+
+#if wxUSE_FILE && wxUSE_FILEDLG
+
+// pass an uninitialized file object, the function will ask the user for the
+// filename and try to open it, returns TRUE on success (file was opened),
+// FALSE if file couldn't be opened/created and -1 if the file selection
+// dialog was cancelled
+static int OpenLogFile(wxFile& file, wxString *pFilename)
+{
+    // get the file name
+    // -----------------
+    wxString filename = wxSaveFileSelector(wxT("log"), wxT("txt"), wxT("log.txt"));
+    if ( !filename ) {
+        // cancelled
+        return -1;
+    }
+
+    // open file
+    // ---------
+    bool bOk = FALSE;
+    if ( wxFile::Exists(filename) ) {
+        bool bAppend = FALSE;
+        wxString strMsg;
+        strMsg.Printf(_("Append log to file '%s' (choosing [No] will overwrite it)?"),
+                      filename.c_str());
+        switch ( wxMessageBox(strMsg, _("Question"),
+                              wxICON_QUESTION | wxYES_NO | wxCANCEL) ) {
+            case wxYES:
+                bAppend = TRUE;
+                break;
+
+            case wxNO:
+                bAppend = FALSE;
+                break;
+
+            case wxCANCEL:
+                return -1;
+
+            default:
+                wxFAIL_MSG(_("invalid message box return value"));
+        }
+
+        if ( bAppend ) {
+            bOk = file.Open(filename, wxFile::write_append);
+        }
+        else {
+            bOk = file.Create(filename, TRUE /* overwrite */);
+        }
+    }
+    else {
+        bOk = file.Create(filename);
+    }
+
+    if ( pFilename )
+        *pFilename = filename;
+
+    return bOk;
+}
+
+#endif // wxUSE_FILE
+
+#endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW)
+
+#if wxUSE_TEXTCTRL
+
+// ----------------------------------------------------------------------------
+// wxLogTextCtrl implementation
+// ----------------------------------------------------------------------------
+
+wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
+{
+    m_pTextCtrl = pTextCtrl;
+}
+
+void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+{
+    wxString msg;
+    TimeStamp(&msg);
+
+#ifdef __WXMAC__
+    // VZ: this is a bug in wxMac, it *must* accept '\n' as new line, the
+    //     translation must be done in wxTextCtrl, not here! (FIXME)
+    msg << szString << wxT('\r');
+#else
+    msg << szString << wxT('\n');
+#endif
+
+    m_pTextCtrl->AppendText(msg);
+}
+
+#endif // wxUSE_TEXTCTRL
+