Added wxComboPopup::FindItem() to help in deciding how SetValue() should change the...

[wxWidgets.git] / src / generic / logg.cpp

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index cba360cc862e54c0a9681abfae3cad9d4c283c78..67fee0d39c4d184c2a75522274338ef6f40e5d95 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -44,16 +44,21 @@
 #if wxUSE_LOGGUI || wxUSE_LOGWINDOW
 
 #include "wx/file.h"
 #if wxUSE_LOGGUI || wxUSE_LOGWINDOW
 
 #include "wx/file.h"

+#include "wx/clipbrd.h"
+#include "wx/dataobj.h"

 #include "wx/textfile.h"
 #include "wx/statline.h"
 #include "wx/artprov.h"
 #include "wx/collpane.h"
 #include "wx/textfile.h"
 #include "wx/statline.h"
 #include "wx/artprov.h"
 #include "wx/collpane.h"

+#include "wx/arrstr.h"
+#include "wx/msgout.h"

 
 #ifdef  __WXMSW__
     // for OutputDebugString()
     #include  "wx/msw/private.h"
 #endif // Windows
 
 
 #ifdef  __WXMSW__
     // for OutputDebugString()
     #include  "wx/msw/private.h"
 #endif // Windows
 

+

 #ifdef  __WXPM__
     #include <time.h>
 #endif
 #ifdef  __WXPM__
     #include <time.h>
 #endif


@@ -71,7 +76,9 @@
 #include "wx/datetime.h"
 
 // the suffix we add to the button to show that the dialog can be expanded
 #include "wx/datetime.h"
 
 // the suffix we add to the button to show that the dialog can be expanded

-#define EXPAND_SUFFIX _T(" >>")
+#define EXPAND_SUFFIX wxT(" >>")
+
+#define CAN_SAVE_FILES (wxUSE_FILE && wxUSE_FILEDLG)

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes


@@ -89,7 +96,7 @@ static wxString TimeStamp(const wxString& format, time_t t)
     if ( !wxStrftime(buf, WXSIZEOF(buf), format, wxLocaltime_r(&t, &tm)) )
     {
         // buffer is too small?
     if ( !wxStrftime(buf, WXSIZEOF(buf), format, wxLocaltime_r(&t, &tm)) )
     {
         // buffer is too small?

-        wxFAIL_MSG(_T("strftime() failed"));
+        wxFAIL_MSG(wxT("strftime() failed"));

     }
     return wxString(buf);
 #else // !wxUSE_DATETIME
     }
     return wxString(buf);
 #else // !wxUSE_DATETIME


@@ -111,10 +118,12 @@ public:
 
     // event handlers
     void OnOk(wxCommandEvent& event);
 
     // event handlers
     void OnOk(wxCommandEvent& event);

-#if wxUSE_FILE
+#if wxUSE_CLIPBOARD
+    void OnCopy(wxCommandEvent& event);
+#endif // wxUSE_CLIPBOARD
+#if CAN_SAVE_FILES

     void OnSave(wxCommandEvent& event);
     void OnSave(wxCommandEvent& event);

-#endif // wxUSE_FILE
-    void OnListSelect(wxListEvent& event);
+#endif // CAN_SAVE_FILES

     void OnListItemActivated(wxListEvent& event);
 
 private:
     void OnListItemActivated(wxListEvent& event);
 
 private:


@@ -136,6 +145,12 @@ private:
         return text;
     }
 
         return text;
     }
 

+#if CAN_SAVE_FILES || wxUSE_CLIPBOARD
+    // return the contents of the dialog as a multiline string
+    wxString GetLogMessages() const;
+#endif // CAN_SAVE_FILES || wxUSE_CLIPBOARD
+
+

     // the data for the listctrl
     wxArrayString m_messages;
     wxArrayInt m_severity;
     // the data for the listctrl
     wxArrayString m_messages;
     wxArrayInt m_severity;


@@ -144,14 +159,6 @@ private:
     // the controls which are not shown initially (but only when details
     // button is pressed)
     wxListCtrl *m_listctrl;
     // the controls which are not shown initially (but only when details
     // button is pressed)
     wxListCtrl *m_listctrl;

-#ifndef __SMARTPHONE__
-#if wxUSE_STATLINE
-    wxStaticLine *m_statline;
-#endif // wxUSE_STATLINE
-#if wxUSE_FILE
-    wxButton *m_btnSave;
-#endif // wxUSE_FILE
-#endif // __SMARTPHONE__

 
     // the translated "Details" string
     static wxString ms_details;
 
     // the translated "Details" string
     static wxString ms_details;


@@ -160,15 +167,17 @@ private:
     static size_t ms_maxLength;
 
     DECLARE_EVENT_TABLE()
     static size_t ms_maxLength;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxLogDialog)
+    wxDECLARE_NO_COPY_CLASS(wxLogDialog);

 };
 
 BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxLogDialog::OnOk)
 };
 
 BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
     EVT_BUTTON(wxID_OK, wxLogDialog::OnOk)

-#if wxUSE_FILE
+#if wxUSE_CLIPBOARD
+    EVT_BUTTON(wxID_COPY,   wxLogDialog::OnCopy)
+#endif // wxUSE_CLIPBOARD
+#if CAN_SAVE_FILES

     EVT_BUTTON(wxID_SAVE,   wxLogDialog::OnSave)
     EVT_BUTTON(wxID_SAVE,   wxLogDialog::OnSave)

-#endif // wxUSE_FILE
-    EVT_LIST_ITEM_SELECTED(wxID_ANY, wxLogDialog::OnListSelect)
+#endif // CAN_SAVE_FILES

     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxLogDialog::OnListItemActivated)
 END_EVENT_TABLE()
 
     EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxLogDialog::OnListItemActivated)
 END_EVENT_TABLE()
 


@@ -178,7 +187,7 @@ END_EVENT_TABLE()
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-#if wxUSE_FILE && wxUSE_FILEDLG
+#if CAN_SAVE_FILES

 
 // 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),
 
 // 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),


@@ -186,65 +195,12 @@ END_EVENT_TABLE()
 // dialog was cancelled
 static int OpenLogFile(wxFile& file, wxString *filename = NULL, wxWindow *parent = NULL);
 
 // dialog was cancelled
 static int OpenLogFile(wxFile& file, wxString *filename = NULL, wxWindow *parent = NULL);
 

-#endif // wxUSE_FILE
-
-// ----------------------------------------------------------------------------
-// global variables
-// ----------------------------------------------------------------------------
-
-// we use a global variable to store the frame pointer for wxLogStatus - bad,
-// but it's the easiest way
-static wxFrame *gs_pFrame = NULL; // FIXME MT-unsafe
+#endif // CAN_SAVE_FILES

 
 // ============================================================================
 // implementation
 // ============================================================================
 
 
 // ============================================================================
 // implementation
 // ============================================================================
 

-// ----------------------------------------------------------------------------
-// global functions
-// ----------------------------------------------------------------------------
-
-// accepts an additional argument which tells to which frame the output should
-// be directed
-void wxVLogStatus(wxFrame *pFrame, const wxString& format, va_list argptr)
-{
-  wxString msg;
-
-  wxLog *pLog = wxLog::GetActiveTarget();
-  if ( pLog != NULL ) {
-    msg.PrintfV(format, argptr);
-
-    wxASSERT( gs_pFrame == NULL ); // should be reset!
-    gs_pFrame = pFrame;
-#ifdef __WXWINCE__
-    wxLog::OnLog(wxLOG_Status, msg, 0);
-#else
-    wxLog::OnLog(wxLOG_Status, msg, time(NULL));
-#endif
-    gs_pFrame = (wxFrame *) NULL;
-  }
-}
-
-#if !wxUSE_UTF8_LOCALE_ONLY
-void wxDoLogStatusWchar(wxFrame *pFrame, const wxChar *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-    wxVLogStatus(pFrame, format, argptr);
-    va_end(argptr);
-}
-#endif // !wxUSE_UTF8_LOCALE_ONLY
-
-#if wxUSE_UNICODE_UTF8
-void wxDoLogStatusUtf8(wxFrame *pFrame, const char *format, ...)
-{
-    va_list argptr;
-    va_start(argptr, format);
-    wxVLogStatus(pFrame, format, argptr);
-    va_end(argptr);
-}
-#endif // wxUSE_UNICODE_UTF8
-

 // ----------------------------------------------------------------------------
 // wxLogGui implementation (FIXME MT-unsafe)
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxLogGui implementation (FIXME MT-unsafe)
 // ----------------------------------------------------------------------------


@@ -267,93 +223,124 @@ void wxLogGui::Clear()
     m_aTimes.Empty();
 }
 
     m_aTimes.Empty();
 }
 

+int wxLogGui::GetSeverityIcon() const
+{
+    return m_bErrors ? wxICON_STOP
+                     : m_bWarnings ? wxICON_EXCLAMATION
+                                   : wxICON_INFORMATION;
+}
+
+wxString wxLogGui::GetTitle() const
+{
+    wxString titleFormat;
+    switch ( GetSeverityIcon() )
+    {
+        case wxICON_STOP:
+            titleFormat = _("%s Error");
+            break;
+
+        case wxICON_EXCLAMATION:
+            titleFormat = _("%s Warning");
+            break;
+
+        default:
+            wxFAIL_MSG( "unexpected icon severity" );
+            // fall through
+
+        case wxICON_INFORMATION:
+            titleFormat = _("%s Information");
+    }
+
+    return wxString::Format(titleFormat, wxTheApp->GetAppDisplayName());
+}
+
+void
+wxLogGui::DoShowSingleLogMessage(const wxString& message,
+                                 const wxString& title,
+                                 int style)
+{
+    wxMessageBox(message, title, wxOK | style);
+}
+
+void
+wxLogGui::DoShowMultipleLogMessages(const wxArrayString& messages,
+                                    const wxArrayInt& severities,
+                                    const wxArrayLong& times,
+                                    const wxString& title,
+                                    int style)
+{
+#if wxUSE_LOG_DIALOG
+    wxLogDialog dlg(NULL,
+                    messages, severities, times,
+                    title, style);
+
+    // clear the message list before showing the dialog because while it's
+    // shown some new messages may appear
+    Clear();
+
+    (void)dlg.ShowModal();
+#else // !wxUSE_LOG_DIALOG
+    // start from the most recent message
+    wxString message;
+    const size_t nMsgCount = messages.size();
+    message.reserve(nMsgCount*100);
+    for ( size_t n = nMsgCount; n > 0; n-- ) {
+        message << m_aMessages[n - 1] << wxT("\n");
+    }
+
+    DoShowSingleLogMessage(message, title, style);
+#endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
+}
+

 void wxLogGui::Flush()
 {
 void wxLogGui::Flush()
 {

+    wxLog::Flush();
+

     if ( !m_bHasMessages )
         return;
 
     // do it right now to block any new calls to Flush() while we're here
     m_bHasMessages = false;
 
     if ( !m_bHasMessages )
         return;
 
     // do it right now to block any new calls to Flush() while we're here
     m_bHasMessages = false;
 

-    const unsigned repeatCount = LogLastRepetitionCountIfNeeded();
+    // note that this must be done before examining m_aMessages as it may log
+    // yet another message
+    const unsigned repeatCount = LogLastRepeatIfNeeded();

 
 

-    wxString appName = wxTheApp->GetAppDisplayName();
+    const size_t nMsgCount = m_aMessages.size();

 
 

-    long style;
-    wxString titleFormat;
-    if ( m_bErrors ) {
-        titleFormat = _("%s Error");
-        style = wxICON_STOP;
-    }
-    else if ( m_bWarnings ) {
-        titleFormat = _("%s Warning");
-        style = wxICON_EXCLAMATION;
-    }
-    else {
-        titleFormat = _("%s Information");
-        style = wxICON_INFORMATION;
+    if ( repeatCount > 0 )
+    {
+        m_aMessages[nMsgCount - 1] << " (" << m_aMessages[nMsgCount - 2] << ")";

     }
 
     }
 

-    wxString title;
-    title.Printf(titleFormat, appName.c_str());
-
-    size_t nMsgCount = m_aMessages.GetCount();
+    const wxString title = GetTitle();
+    const int style = GetSeverityIcon();

 
     // avoid showing other log dialogs until we're done with the dialog we're
     // showing right now: nested modal dialogs make for really bad UI!
     Suspend();
 
 
     // avoid showing other log dialogs until we're done with the dialog we're
     // showing right now: nested modal dialogs make for really bad UI!
     Suspend();
 

-    wxString str;

     if ( nMsgCount == 1 )
     {
     if ( nMsgCount == 1 )
     {

-        str = m_aMessages[0];
+        // make a copy before calling Clear()
+        const wxString message(m_aMessages[0]);
+        Clear();
+
+        DoShowSingleLogMessage(message, title, style);

     }
     else // more than one message
     {
     }
     else // more than one message
     {

-#if wxUSE_LOG_DIALOG
+        wxArrayString messages;
+        wxArrayInt severities;
+        wxArrayLong times;

 
 

-        if ( repeatCount > 0 )
-        {
-            m_aMessages[nMsgCount - 1]
-                << " (" << m_aMessages[nMsgCount - 2] << ")";
-        }
-
-        wxLogDialog dlg(NULL,
-                        m_aMessages, m_aSeverity, m_aTimes,
-                        title, style);
+        messages.swap(m_aMessages);
+        severities.swap(m_aSeverity);
+        times.swap(m_aTimes);

 
 

-        // clear the message list before showing the dialog because while it's
-        // shown some new messages may appear

         Clear();
 
         Clear();
 

-        (void)dlg.ShowModal();
-#else // !wxUSE_LOG_DIALOG
-        // concatenate all strings (but not too many to not overfill the msg box)
-        size_t nLines = 0;
-
-        // 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] << wxT("\n");
-        }
-#endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
-    }
-
-    // this catches both cases of 1 message with wxUSE_LOG_DIALOG and any
-    // situation without it
-    if ( !str.empty() )
-    {
-        wxMessageBox(str, title, wxOK | style);
-
-        // no undisplayed messages whatsoever
-        Clear();
+        DoShowMultipleLogMessages(messages, severities, times, title, style);

     }
 
     // allow flushing the logs again
     }
 
     // allow flushing the logs again


@@ -361,16 +348,19 @@ void wxLogGui::Flush()
 }
 
 // log all kinds of messages
 }
 
 // log all kinds of messages

-void wxLogGui::DoLog(wxLogLevel level, const wxString& szString, time_t t)
+void wxLogGui::DoLogRecord(wxLogLevel level,
+                           const wxString& msg,
+                           const wxLogRecordInfo& info)

 {
 {

-    switch ( level ) {
+    switch ( level )
+    {

         case wxLOG_Info:
             if ( GetVerbose() )
         case wxLOG_Message:
             {
         case wxLOG_Info:
             if ( GetVerbose() )
         case wxLOG_Message:
             {

-                m_aMessages.Add(szString);
+                m_aMessages.Add(msg);

                 m_aSeverity.Add(wxLOG_Message);
                 m_aSeverity.Add(wxLOG_Message);

-                m_aTimes.Add((long)t);
+                m_aTimes.Add((long)info.timestamp);

                 m_bHasMessages = true;
             }
             break;
                 m_bHasMessages = true;
             }
             break;


@@ -378,8 +368,16 @@ void wxLogGui::DoLog(wxLogLevel level, const wxString& szString, time_t t)
         case wxLOG_Status:
 #if wxUSE_STATUSBAR
             {
         case wxLOG_Status:
 #if wxUSE_STATUSBAR
             {

+                wxFrame *pFrame = NULL;
+
+                // check if the frame was passed to us explicitly
+                wxUIntPtr ptr = 0;
+                if ( info.GetNumValue(wxLOG_KEY_FRAME, &ptr) )
+                {
+                    pFrame = static_cast<wxFrame *>(wxUIntToPtr(ptr));
+                }
+

                 // find the top window and set it's status text if it has any
                 // 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)) ) {
                 if ( pFrame == NULL ) {
                     wxWindow *pWin = wxTheApp->GetTopWindow();
                     if ( pWin != NULL && pWin->IsKindOf(CLASSINFO(wxFrame)) ) {


@@ -388,43 +386,11 @@ void wxLogGui::DoLog(wxLogLevel level, const wxString& szString, time_t t)
                 }
 
                 if ( pFrame && pFrame->GetStatusBar() )
                 }
 
                 if ( pFrame && pFrame->GetStatusBar() )

-                    pFrame->SetStatusText(szString);
+                    pFrame->SetStatusText(msg);

             }
 #endif // wxUSE_STATUSBAR
             break;
 
             }
 #endif // wxUSE_STATUSBAR
             break;
 

-        case wxLOG_Trace:
-        case wxLOG_Debug:
-            #ifdef __WXDEBUG__
-            {
-                wxString str;
-                TimeStamp(&str);
-                str += szString;
-
-                #if defined(__WXMSW__) && !defined(__WXMICROWIN__)
-                    // don't prepend debug/trace here: it goes to the
-                    // debug window anyhow
-                    str += wxT("\r\n");
-                    OutputDebugString(str.wx_str());
-                #else
-                    // send them to stderr
-                    wxFprintf(stderr, wxT("[%s] %s\n"),
-                              level == wxLOG_Trace ? wxT("Trace")
-                                                   : wxT("Debug"),
-                              str.c_str());
-                    fflush(stderr);
-                #endif
-            }
-            #endif // __WXDEBUG__
-
-            break;
-
-        case wxLOG_FatalError:
-            // show this one immediately
-            wxMessageBox(szString, _("Fatal error"), wxICON_HAND);
-            wxExit();
-            break;
-

         case wxLOG_Error:
             if ( !m_bErrors ) {
 #if !wxUSE_LOG_DIALOG
         case wxLOG_Error:
             if ( !m_bErrors ) {
 #if !wxUSE_LOG_DIALOG


@@ -445,11 +411,31 @@ void wxLogGui::DoLog(wxLogLevel level, const wxString& szString, time_t t)
                 m_bWarnings = true;
             }
 
                 m_bWarnings = true;
             }
 

-            m_aMessages.Add(szString);
+            m_aMessages.Add(msg);

             m_aSeverity.Add((int)level);
             m_aSeverity.Add((int)level);

-            m_aTimes.Add((long)t);
+            m_aTimes.Add((long)info.timestamp);

             m_bHasMessages = true;
             break;
             m_bHasMessages = true;
             break;

+
+        case wxLOG_Debug:
+        case wxLOG_Trace:
+            // let the base class deal with debug/trace messages
+            wxLog::DoLogRecord(level, msg, info);
+            break;
+
+        case wxLOG_FatalError:
+        case wxLOG_Max:
+            // fatal errors are shown immediately and terminate the program so
+            // we should never see them here
+            wxFAIL_MSG("unexpected log level");
+            break;
+
+        case wxLOG_Progress:
+        case wxLOG_User:
+            // just ignore those: passing them to the base class would result
+            // in asserts from DoLogText() because DoLogTextAtLevel() would
+            // call it as it doesn't know how to handle these levels otherwise
+            break;

     }
 }
 
     }
 }
 


@@ -473,13 +459,16 @@ public:
     // menu callbacks
     void OnClose(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
     // menu callbacks
     void OnClose(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);

-#if wxUSE_FILE
-    void OnSave (wxCommandEvent& event);
-#endif // wxUSE_FILE
+#if CAN_SAVE_FILES
+    void OnSave(wxCommandEvent& event);
+#endif // CAN_SAVE_FILES

     void OnClear(wxCommandEvent& event);
 
     void OnClear(wxCommandEvent& event);
 

-    // accessors
-    wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
+    // do show the message in the text control
+    void ShowLogMessage(const wxString& message)
+    {
+        m_pTextCtrl->AppendText(message + wxS('\n'));
+    }

 
 private:
     // use standard ids for our commands!
 
 private:
     // use standard ids for our commands!


@@ -497,15 +486,15 @@ private:
     wxLogWindow *m_log;
 
     DECLARE_EVENT_TABLE()
     wxLogWindow *m_log;
 
     DECLARE_EVENT_TABLE()

-    DECLARE_NO_COPY_CLASS(wxLogFrame)
+    wxDECLARE_NO_COPY_CLASS(wxLogFrame);

 };
 
 BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
     // wxLogWindow menu events
     EVT_MENU(Menu_Close, wxLogFrame::OnClose)
 };
 
 BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
     // wxLogWindow menu events
     EVT_MENU(Menu_Close, wxLogFrame::OnClose)

-#if wxUSE_FILE
+#if CAN_SAVE_FILES

     EVT_MENU(Menu_Save,  wxLogFrame::OnSave)
     EVT_MENU(Menu_Save,  wxLogFrame::OnSave)

-#endif // wxUSE_FILE
+#endif // CAN_SAVE_FILES

     EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
 
     EVT_CLOSE(wxLogFrame::OnCloseWindow)
     EVT_MENU(Menu_Clear, wxLogFrame::OnClear)
 
     EVT_CLOSE(wxLogFrame::OnCloseWindow)


@@ -531,9 +520,9 @@ wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTi
     // create menu
     wxMenuBar *pMenuBar = new wxMenuBar;
     wxMenu *pMenu = new wxMenu;
     // create menu
     wxMenuBar *pMenuBar = new wxMenuBar;
     wxMenu *pMenu = new wxMenu;

-#if wxUSE_FILE
+#if CAN_SAVE_FILES

     pMenu->Append(Menu_Save,  _("&Save..."), _("Save log contents to file"));
     pMenu->Append(Menu_Save,  _("&Save..."), _("Save log contents to file"));

-#endif // wxUSE_FILE
+#endif // CAN_SAVE_FILES

     pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents"));
     pMenu->AppendSeparator();
     pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));
     pMenu->Append(Menu_Clear, _("C&lear"), _("Clear the log contents"));
     pMenu->AppendSeparator();
     pMenu->Append(Menu_Close, _("&Close"), _("Close this window"));


@@ -569,10 +558,9 @@ void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     DoClose();
 }
 
     DoClose();
 }
 

-#if wxUSE_FILE
+#if CAN_SAVE_FILES

 void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 {
 void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 {

-#if wxUSE_FILEDLG

     wxString filename;
     wxFile file;
     int rc = OpenLogFile(file, &filename, this);
     wxString filename;
     wxFile file;
     int rc = OpenLogFile(file, &filename, this);


@@ -601,9 +589,8 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
     else {
         wxLogStatus((wxFrame*)this, _("Log saved to the file '%s'."), filename.c_str());
     }
     else {
         wxLogStatus((wxFrame*)this, _("Log saved to the file '%s'."), filename.c_str());
     }

-#endif

 }
 }

-#endif // wxUSE_FILE
+#endif // CAN_SAVE_FILES

 
 void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
 {


@@ -623,6 +610,11 @@ wxLogWindow::wxLogWindow(wxWindow *pParent,
                          bool bShow,
                          bool bDoPass)
 {
                          bool bShow,
                          bool bDoPass)
 {

+    // Initialize it to NULL to ensure that we don't crash if any log messages
+    // are generated before the frame is fully created (while this doesn't
+    // happen normally, it might, in principle).
+    m_pLogFrame = NULL;
+

     PassMessages(bDoPass);
 
     m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
     PassMessages(bDoPass);
 
     m_pLogFrame = new wxLogFrame(pParent, this, szTitle);


@@ -636,56 +628,20 @@ void wxLogWindow::Show(bool bShow)
     m_pLogFrame->Show(bShow);
 }
 
     m_pLogFrame->Show(bShow);
 }
 

-void wxLogWindow::DoLog(wxLogLevel level, const wxString& szString, time_t t)
+void wxLogWindow::DoLogTextAtLevel(wxLogLevel level, const wxString& msg)

 {
 {

-    // first let the previous logger show it
-    wxLogPassThrough::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 ( !szString.empty() )
-                {
-                    wxString str;
-                    str << _("Status: ") << szString;
-                    LogString(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);
-        }
-    }
-}
-
-void wxLogWindow::DoLogString(const wxString& 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__
-    wxTextPos nLen = pText->GetLastPosition();
-    pText->SetSelection(nLen, nLen);
-#endif // Windows
-
-    wxString msg;
-    TimeStamp(&msg);
-    msg << szString << wxT('\n');
+    if ( !m_pLogFrame )
+        return;

 
 

-    pText->AppendText(msg);
+    // 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 (e.g. wxMSW code uses
+    //    wxLogTrace to log Windows messages and adding text to the control
+    //    sends more of them) thus sending a program into an infinite loop
+    if ( level == wxLOG_Trace )
+        return;

 
 

-    // TODO ensure that the line can be seen
+    m_pLogFrame->ShowLogMessage(msg);

 }
 
 wxFrame *wxLogWindow::GetFrame() const
 }
 
 wxFrame *wxLogWindow::GetFrame() const


@@ -705,7 +661,7 @@ bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame))
 
 void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
 {
 
 void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
 {

-    m_pLogFrame = (wxLogFrame *)NULL;
+    m_pLogFrame = NULL;

 }
 
 wxLogWindow::~wxLogWindow()
 }
 
 wxLogWindow::~wxLogWindow()


@@ -722,12 +678,6 @@ wxLogWindow::~wxLogWindow()
 
 #if wxUSE_LOG_DIALOG
 
 
 #if wxUSE_LOG_DIALOG
 

-#ifndef __SMARTPHONE__
-static const size_t MARGIN = 10;
-#else
-static const size_t MARGIN = 0;
-#endif
-

 wxString wxLogDialog::ms_details;
 size_t wxLogDialog::ms_maxLength = 0;
 
 wxString wxLogDialog::ms_details;
 size_t wxLogDialog::ms_maxLength = 0;
 


@@ -771,19 +721,7 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
         m_times.Add(times[n]);
     }
 
         m_times.Add(times[n]);
     }
 

-    m_listctrl = (wxListCtrl *)NULL;
-
-#ifndef __SMARTPHONE__
-
-#if wxUSE_STATLINE
-    m_statline = (wxStaticLine *)NULL;
-#endif // wxUSE_STATLINE
-
-#if wxUSE_FILE
-    m_btnSave = (wxButton *)NULL;
-#endif // wxUSE_FILE
-
-#endif // __SMARTPHONE__
+    m_listctrl = NULL;

 
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 
 
     bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
 


@@ -801,7 +739,7 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
                                     wxID_ANY,
                                     wxArtProvider::GetMessageBoxIcon(style)
                                    );
                                     wxID_ANY,
                                     wxArtProvider::GetMessageBoxIcon(style)
                                    );

-        sizerAll->Add(icon, 0, wxALIGN_CENTRE_VERTICAL);
+        sizerAll->Add(icon, wxSizerFlags().Centre());

     }
 
     // create the text sizer with a minimal size so that we are sure it won't be too small
     }
 
     // create the text sizer with a minimal size so that we are sure it won't be too small


@@ -809,31 +747,43 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
     wxSizer *szText = CreateTextSizer(message);
     szText->SetMinSize(wxMin(300, wxGetDisplaySize().x / 3), -1);
 
     wxSizer *szText = CreateTextSizer(message);
     szText->SetMinSize(wxMin(300, wxGetDisplaySize().x / 3), -1);
 

-    sizerAll->Add(szText, 1,
-                  wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT, MARGIN);
+    sizerAll->Add(szText, wxSizerFlags(1).Centre().Border(wxLEFT | wxRIGHT));

 
     wxButton *btnOk = new wxButton(this, wxID_OK);
 
     wxButton *btnOk = new wxButton(this, wxID_OK);

-    sizerAll->Add(btnOk, 0, isPda ? wxCENTRE : wxCENTRE|wxBOTTOM, MARGIN/2);
+    sizerAll->Add(btnOk, wxSizerFlags().Centre());

 
 

-    sizerTop->Add(sizerAll, 0, wxALL | wxEXPAND, MARGIN);
+    sizerTop->Add(sizerAll, wxSizerFlags().Expand().Border());

 
 
     // add the details pane
 
 
     // add the details pane

-

 #ifndef __SMARTPHONE__
 #ifndef __SMARTPHONE__

-    wxCollapsiblePane *collpane = new wxCollapsiblePane(this, wxID_ANY, ms_details);
-    sizerTop->Add(collpane, 1, wxGROW|wxALL, MARGIN);
+    wxCollapsiblePane * const
+        collpane = new wxCollapsiblePane(this, wxID_ANY, ms_details);
+    sizerTop->Add(collpane, wxSizerFlags(1).Expand().Border());

 
     wxWindow *win = collpane->GetPane();
 
     wxWindow *win = collpane->GetPane();

-    wxSizer *paneSz = new wxBoxSizer(wxVERTICAL);
+    wxSizer * const paneSz = new wxBoxSizer(wxVERTICAL);

 
     CreateDetailsControls(win);
 
 
     CreateDetailsControls(win);
 

-    paneSz->Add(m_listctrl, 1, wxEXPAND | wxTOP, MARGIN);
+    paneSz->Add(m_listctrl, wxSizerFlags(1).Expand().Border(wxTOP));

 
 

-#if wxUSE_FILE && !defined(__SMARTPHONE__)
-    paneSz->Add(m_btnSave, 0, wxALIGN_RIGHT | wxTOP, MARGIN);
-#endif // wxUSE_FILE
+#if wxUSE_CLIPBOARD || CAN_SAVE_FILES
+    wxBoxSizer * const btnSizer = new wxBoxSizer(wxHORIZONTAL);
+
+    wxSizerFlags flagsBtn;
+    flagsBtn.Border(wxLEFT);
+
+#if wxUSE_CLIPBOARD
+    btnSizer->Add(new wxButton(win, wxID_COPY), flagsBtn);
+#endif // wxUSE_CLIPBOARD
+
+#if CAN_SAVE_FILES
+    btnSizer->Add(new wxButton(win, wxID_SAVE), flagsBtn);
+#endif // CAN_SAVE_FILES
+
+    paneSz->Add(btnSizer, wxSizerFlags().Right().Border(wxTOP));
+#endif // wxUSE_CLIPBOARD || CAN_SAVE_FILES

 
     win->SetSizer(paneSz);
     paneSz->SetSizeHints(win);
 
     win->SetSizer(paneSz);
     paneSz->SetSizeHints(win);


@@ -856,18 +806,13 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
 
 void wxLogDialog::CreateDetailsControls(wxWindow *parent)
 {
 
 void wxLogDialog::CreateDetailsControls(wxWindow *parent)
 {

-#ifndef __SMARTPHONE__
-    // create the save button and separator line if possible
-#if wxUSE_FILE
-    m_btnSave = new wxButton(parent, wxID_SAVE);
-#endif // wxUSE_FILE
-
-#endif // __SMARTPHONE__
+    wxString fmt = wxLog::GetTimestamp();
+    bool hasTimeStamp = !fmt.IsEmpty();

 
     // create the list ctrl now
     m_listctrl = new wxListCtrl(parent, wxID_ANY,
                                 wxDefaultPosition, wxDefaultSize,
 
     // create the list ctrl now
     m_listctrl = new wxListCtrl(parent, wxID_ANY,
                                 wxDefaultPosition, wxDefaultSize,

-                                wxSUNKEN_BORDER |
+                                wxBORDER_SIMPLE |

                                 wxLC_REPORT |
                                 wxLC_NO_HEADER |
                                 wxLC_SINGLE_SEL);
                                 wxLC_REPORT |
                                 wxLC_NO_HEADER |
                                 wxLC_SINGLE_SEL);


@@ -879,15 +824,17 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
 
     // no need to translate these strings as they're not shown to the
     // user anyhow (we use wxLC_NO_HEADER style)
 
     // 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"));
+    m_listctrl->InsertColumn(0, wxT("Message"));
+
+    if (hasTimeStamp)
+        m_listctrl->InsertColumn(1, wxT("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!
 
     // 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 wxChar* icons[] =
+    static const wxChar* const icons[] =

     {
         wxART_ERROR,
         wxART_WARNING,
     {
         wxART_ERROR,
         wxART_WARNING,


@@ -915,14 +862,7 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
 
     m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
 
 
     m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
 

-    // and fill it
-    wxString fmt = wxLog::GetTimestamp();
-    if ( !fmt )
-    {
-        // default format
-        fmt = _T("%c");
-    }
-
+    // fill the listctrl

     size_t count = m_messages.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {
     size_t count = m_messages.GetCount();
     for ( size_t n = 0; n < count; n++ )
     {


@@ -954,12 +894,15 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
         msg = EllipsizeString(msg);
 
         m_listctrl->InsertItem(n, msg, image);
         msg = EllipsizeString(msg);
 
         m_listctrl->InsertItem(n, msg, image);

-        m_listctrl->SetItem(n, 1, TimeStamp(fmt, (time_t)m_times[n]));
+
+        if (hasTimeStamp)
+            m_listctrl->SetItem(n, 1, TimeStamp(fmt, (time_t)m_times[n]));

     }
 
     // let the columns size themselves
     m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE);
     }
 
     // let the columns size themselves
     m_listctrl->SetColumnWidth(0, wxLIST_AUTOSIZE);

-    m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE);
+    if (hasTimeStamp)
+        m_listctrl->SetColumnWidth(1, wxLIST_AUTOSIZE);

 
     // calculate an approximately nice height for the listctrl
     int height = GetCharHeight()*(count + 4);
 
     // calculate an approximately nice height for the listctrl
     int height = GetCharHeight()*(count + 4);


@@ -978,14 +921,6 @@ void wxLogDialog::CreateDetailsControls(wxWindow *parent)
     m_listctrl->SetSize(wxDefaultCoord, wxMin(height, heightMax));
 }
 
     m_listctrl->SetSize(wxDefaultCoord, wxMin(height, heightMax));
 }
 

-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::OnListItemActivated(wxListEvent& event)
 {
     // show the activated item in a message box
 void wxLogDialog::OnListItemActivated(wxListEvent& event)
 {
     // show the activated item in a message box


@@ -998,7 +933,7 @@ void wxLogDialog::OnListItemActivated(wxListEvent& event)
     // as there's a 260 chars limit on the items inside a wxListCtrl in wxMSW.
     wxString str = m_messages[event.GetIndex()];
 
     // as there's a 260 chars limit on the items inside a wxListCtrl in wxMSW.
     wxString str = m_messages[event.GetIndex()];
 

-    // wxMessageBox will nicely handle the '\n' in the string (if any) 
+    // wxMessageBox will nicely handle the '\n' in the string (if any)

     // and supports long strings
     wxMessageBox(str, wxT("Log message"), wxOK, this);
 }
     // and supports long strings
     wxMessageBox(str, wxT("Log message"), wxOK, this);
 }


@@ -1008,49 +943,67 @@ void wxLogDialog::OnOk(wxCommandEvent& WXUNUSED(event))
     EndModal(wxID_OK);
 }
 
     EndModal(wxID_OK);
 }
 

-#if wxUSE_FILE
+#if CAN_SAVE_FILES || wxUSE_CLIPBOARD

 
 

-void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
+wxString wxLogDialog::GetLogMessages() const

 {
 {

-#if wxUSE_FILEDLG
-    wxFile file;
-    int rc = OpenLogFile(file, NULL, this);
-    if ( rc == -1 )
-    {
-        // cancelled
-        return;
-    }
-
-    bool ok = rc != 0;
-

     wxString fmt = wxLog::GetTimestamp();
     wxString fmt = wxLog::GetTimestamp();

-    if ( !fmt )
+    if ( fmt.empty() )

     {
     {

-        // default format
-        fmt = _T("%c");
+        // use the default format
+        fmt = "%c";

     }
 
     }
 

-    size_t count = m_messages.GetCount();
-    for ( size_t n = 0; ok && (n < count); n++ )
+    const size_t count = m_messages.GetCount();
+
+    wxString text;
+    text.reserve(count*m_messages[0].length());
+    for ( size_t n = 0; n < count; n++ )

     {
     {

-        wxString line;
-        line << TimeStamp(fmt, (time_t)m_times[n])
-             << _T(": ")
+        text << TimeStamp(fmt, (time_t)m_times[n])
+             << ": "

              << m_messages[n]
              << wxTextFile::GetEOL();
              << m_messages[n]
              << wxTextFile::GetEOL();

+    }
+
+    return text;
+}
+
+#endif // CAN_SAVE_FILES || wxUSE_CLIPBOARD
+
+#if wxUSE_CLIPBOARD

 
 

-        ok = file.Write(line);
+void wxLogDialog::OnCopy(wxCommandEvent& WXUNUSED(event))
+{
+    wxClipboardLocker clip;
+    if ( !clip ||
+            !wxTheClipboard->AddData(new wxTextDataObject(GetLogMessages())) )
+    {
+        wxLogError(_("Failed to copy dialog contents to the clipboard."));

     }
     }

+}

 
 

-    if ( ok )
-        ok = file.Close();
+#endif // wxUSE_CLIPBOARD

 
 

-    if ( !ok )
+#if CAN_SAVE_FILES
+
+void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
+{
+    wxFile file;
+    int rc = OpenLogFile(file, NULL, this);
+    if ( rc == -1 )
+    {
+        // cancelled
+        return;
+    }
+
+    if ( !rc || !file.Write(GetLogMessages()) || !file.Close() )
+    {

         wxLogError(_("Can't save log contents to file."));
         wxLogError(_("Can't save log contents to file."));

-#endif // wxUSE_FILEDLG
+    }

 }
 
 }
 

-#endif // wxUSE_FILE
+#endif // CAN_SAVE_FILES

 
 wxLogDialog::~wxLogDialog()
 {
 
 wxLogDialog::~wxLogDialog()
 {


@@ -1062,7 +1015,7 @@ wxLogDialog::~wxLogDialog()
 
 #endif // wxUSE_LOG_DIALOG
 
 
 #endif // wxUSE_LOG_DIALOG
 

-#if wxUSE_FILE && wxUSE_FILEDLG
+#if CAN_SAVE_FILES

 
 // 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),
 
 // 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),


@@ -1080,7 +1033,7 @@ static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
 
     // open file
     // ---------
 
     // open file
     // ---------

-    bool bOk wxDUMMY_INITIALIZE(false);
+    bool bOk = true; // suppress warning about it being possible uninitialized

     if ( wxFile::Exists(filename) ) {
         bool bAppend = false;
         wxString strMsg;
     if ( wxFile::Exists(filename) ) {
         bool bAppend = false;
         wxString strMsg;


@@ -1120,7 +1073,7 @@ static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
     return bOk;
 }
 
     return bOk;
 }
 

-#endif // wxUSE_FILE
+#endif // CAN_SAVE_FILES

 
 #endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW)
 
 
 #endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW)
 


@@ -1135,13 +1088,9 @@ wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
     m_pTextCtrl = pTextCtrl;
 }
 
     m_pTextCtrl = pTextCtrl;
 }
 

-void wxLogTextCtrl::DoLogString(const wxString& szString, time_t WXUNUSED(t))
+void wxLogTextCtrl::DoLogText(const wxString& msg)

 {
 {

-    wxString msg;
-    TimeStamp(&msg);
-
-    msg << szString << wxT('\n');
-    m_pTextCtrl->AppendText(msg);
+    m_pTextCtrl->AppendText(msg + wxS('\n'));

 }
 
 #endif // wxUSE_LOG && wxUSE_TEXTCTRL
 }
 
 #endif // wxUSE_LOG && wxUSE_TEXTCTRL