add support for hiding columns when using native header control in wxGrid; also added...

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

diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp
index 0891c8de9ae09341e3d794ad8600001365f78e3b..ed2a915892e807f122b952d3242283c82246458c 100644 (file)
--- a/src/generic/logg.cpp
+++ b/src/generic/logg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        logg.cpp
+// Name:        src/generic/logg.cpp

 // Purpose:     wxLog-derived classes which need GUI support (the rest is in
 //              src/common/log.cpp)
 // Author:      Vadim Zeitlin
 // Purpose:     wxLog-derived classes which need GUI support (the rest is in
 //              src/common/log.cpp)
 // Author:      Vadim Zeitlin


@@ -7,7 +7,7 @@
 // Created:     20.09.99 (extracted from src/common/log.cpp)
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // 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
+// Licence:     wxWindows licence

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


@@ -18,17 +18,11 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // 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__
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-  #pragma hdrstop
-#endif
-
-#if !wxUSE_GUI
-    #error "This file can't be compiled without GUI!"
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP


@@ -43,32 +37,52 @@
     #include "wx/textctrl.h"
     #include "wx/sizer.h"
     #include "wx/statbmp.h"
     #include "wx/textctrl.h"
     #include "wx/sizer.h"
     #include "wx/statbmp.h"

-    #include "wx/button.h"
+    #include "wx/settings.h"
+    #include "wx/wxcrtvararg.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

+#if wxUSE_LOGGUI || wxUSE_LOGWINDOW
+

 #include "wx/file.h"
 #include "wx/file.h"

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

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

+#include "wx/artprov.h"
+#include "wx/collpane.h"
+#include "wx/arrstr.h"

 
 

-#if wxUSE_LOG
+#if wxUSE_THREADS
+    #include "wx/thread.h"
+#endif // wxUSE_THREADS

 
 #ifdef  __WXMSW__
 
 #ifdef  __WXMSW__

-  // for OutputDebugString()
-  #include  "wx/msw/private.h"
+    // for OutputDebugString()
+    #include  "wx/msw/private.h"

 #endif // Windows
 
 #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)
-#define wxUSE_LOG_DIALOG 1
+
+#ifdef  __WXPM__
+    #include <time.h>
+#endif

 
 #if wxUSE_LOG_DIALOG
     #include "wx/listctrl.h"
     #include "wx/imaglist.h"
     #include "wx/image.h"
 
 #if wxUSE_LOG_DIALOG
     #include "wx/listctrl.h"
     #include "wx/imaglist.h"
     #include "wx/image.h"

-#else // !wxUSE_TEXTFILE
-    #include "wx/msgdlg.h"

 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 
 #endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
 

+#if defined(__MWERKS__) && wxUSE_UNICODE
+    #include <wtime.h>
+#endif
+
+#include "wx/datetime.h"
+
+// the suffix we add to the button to show that the dialog can be expanded
+#define EXPAND_SUFFIX _T(" >>")
+
+#define CAN_SAVE_FILES (wxUSE_FILE && wxUSE_FILEDLG)
+

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


@@ -77,15 +91,20 @@
 
 // this function is a wrapper around strftime(3)
 // allows to exclude the usage of wxDateTime
 
 // this function is a wrapper around strftime(3)
 // allows to exclude the usage of wxDateTime

-static wxString TimeStamp(const wxChar *format, time_t t)
+static wxString TimeStamp(const wxString& format, time_t t)

 {
 {

+#if wxUSE_DATETIME

     wxChar buf[4096];
     wxChar buf[4096];

-    if ( !wxStrftime(buf, WXSIZEOF(buf), format, localtime(&t)) )
+    struct tm tm;
+    if ( !wxStrftime(buf, WXSIZEOF(buf), format, wxLocaltime_r(&t, &tm)) )

     {
         // buffer is too small?
         wxFAIL_MSG(_T("strftime() failed"));
     }
     return wxString(buf);
     {
         // buffer is too small?
         wxFAIL_MSG(_T("strftime() failed"));
     }
     return wxString(buf);

+#else // !wxUSE_DATETIME
+    return wxEmptyString;
+#endif // wxUSE_DATETIME/!wxUSE_DATETIME

 }
 
 
 }
 
 


@@ -102,48 +121,69 @@ public:
 
     // event handlers
     void OnOk(wxCommandEvent& event);
 
     // event handlers
     void OnOk(wxCommandEvent& event);

-    void OnDetails(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
+#endif // CAN_SAVE_FILES

     void OnListSelect(wxListEvent& event);
     void OnListSelect(wxListEvent& event);

+    void OnListItemActivated(wxListEvent& event);

 
 private:
     // create controls needed for the details display
 
 private:
     // create controls needed for the details display

-    void CreateDetailsControls();
+    void CreateDetailsControls(wxWindow *);
+
+    // if necessary truncates the given string and adds an ellipsis
+    wxString EllipsizeString(const wxString &text)
+    {
+        if (ms_maxLength > 0 &&
+            text.length() > ms_maxLength)
+        {
+            wxString ret(text);
+            ret.Truncate(ms_maxLength);
+            ret << "...";
+            return ret;
+        }
+
+        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;
     wxArrayLong m_times;
 
 
     // the data for the listctrl
     wxArrayString m_messages;
     wxArrayInt m_severity;
     wxArrayLong m_times;
 

-    // the "toggle" button and its state
-    wxButton *m_btnDetails;
-    bool      m_showingDetails;
-

     // 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;

-#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;
 
 
     // the translated "Details" string
     static wxString ms_details;
 

+    // the maximum length of the log message
+    static size_t ms_maxLength;
+

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_NO_COPY_CLASS(wxLogDialog)

 };
 
 BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
 };
 
 BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)

-    EVT_BUTTON(wxID_CANCEL, wxLogDialog::OnOk)
-    EVT_BUTTON(wxID_MORE,   wxLogDialog::OnDetails)
-#if wxUSE_FILE
+    EVT_BUTTON(wxID_OK, wxLogDialog::OnOk)
+#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(-1, wxLogDialog::OnListSelect)
+#endif // CAN_SAVE_FILES
+    EVT_LIST_ITEM_SELECTED(wxID_ANY, wxLogDialog::OnListSelect)
+    EVT_LIST_ITEM_ACTIVATED(wxID_ANY, wxLogDialog::OnListItemActivated)

 END_EVENT_TABLE()
 
 #endif // wxUSE_LOG_DIALOG
 END_EVENT_TABLE()
 
 #endif // wxUSE_LOG_DIALOG


@@ -152,23 +192,23 @@ END_EVENT_TABLE()
 // private functions
 // ----------------------------------------------------------------------------
 
 // private functions
 // ----------------------------------------------------------------------------
 

-#if wxUSE_FILE
+#if CAN_SAVE_FILES

 
 // pass an uninitialized file object, the function will ask the user for the
 
 // 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
+// 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
 // dialog was cancelled

-static int OpenLogFile(wxFile& file, wxString *filename = NULL);
+static int OpenLogFile(wxFile& file, wxString *filename = NULL, wxWindow *parent = NULL);

 
 

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

 
 // ----------------------------------------------------------------------------
 // global variables
 // ----------------------------------------------------------------------------
 
 // we use a global variable to store the frame pointer for wxLogStatus - bad,
 
 // ----------------------------------------------------------------------------
 // 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
+// but it's the easiest way
+static wxFrame *gs_pFrame = NULL; // FIXME MT-unsafe

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


@@ -180,50 +220,51 @@ static wxFrame *gs_pFrame; // FIXME MT-unsafe
 
 // accepts an additional argument which tells to which frame the output should
 // be directed
 
 // accepts an additional argument which tells to which frame the output should
 // be directed

-void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
+void wxVLogStatus(wxFrame *pFrame, const wxString& format, va_list argptr)

 {
   wxString msg;
 
   wxLog *pLog = wxLog::GetActiveTarget();
   if ( pLog != NULL ) {
 {
   wxString msg;
 
   wxLog *pLog = wxLog::GetActiveTarget();
   if ( pLog != NULL ) {

-    va_list argptr;
-    va_start(argptr, szFormat);
-    msg.PrintfV(szFormat, argptr);
-    va_end(argptr);
+    msg.PrintfV(format, argptr);

 
     wxASSERT( gs_pFrame == NULL ); // should be reset!
     gs_pFrame = pFrame;
 
     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));
     wxLog::OnLog(wxLOG_Status, msg, time(NULL));

+#endif

     gs_pFrame = (wxFrame *) NULL;
   }
 }
 
     gs_pFrame = (wxFrame *) NULL;
   }
 }
 

-// ----------------------------------------------------------------------------
-// wxLogTextCtrl implementation
-// ----------------------------------------------------------------------------
-
-wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
+#if !wxUSE_UTF8_LOCALE_ONLY
+void wxDoLogStatusWchar(wxFrame *pFrame, const wxChar *format, ...)

 {
 {

-    m_pTextCtrl = pTextCtrl;
+    va_list argptr;
+    va_start(argptr, format);
+    wxVLogStatus(pFrame, format, argptr);
+    va_end(argptr);

 }
 }

+#endif // !wxUSE_UTF8_LOCALE_ONLY

 
 

-void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+#if wxUSE_UNICODE_UTF8
+void wxDoLogStatusUtf8(wxFrame *pFrame, const char *format, ...)

 {
 {

-    wxString msg;
-    TimeStamp(&msg);
-#ifdef __WXMAC__
-    msg << szString << wxT('\r');
-#else
-    msg << szString << wxT('\n');
-#endif
-
-    m_pTextCtrl->AppendText(msg);
+    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)
 // ----------------------------------------------------------------------------
 

+#if wxUSE_LOGGUI
+

 wxLogGui::wxLogGui()
 {
     Clear();
 wxLogGui::wxLogGui()
 {
     Clear();


@@ -233,109 +274,146 @@ void wxLogGui::Clear()
 {
     m_bErrors =
     m_bWarnings =
 {
     m_bErrors =
     m_bWarnings =

-    m_bHasMessages = FALSE;
+    m_bHasMessages = false;

 
     m_aMessages.Empty();
     m_aSeverity.Empty();
     m_aTimes.Empty();
 }
 
 
     m_aMessages.Empty();
     m_aSeverity.Empty();
     m_aTimes.Empty();
 }
 

-void wxLogGui::Flush()
+int wxLogGui::GetSeverityIcon() const

 {
 {

-    if ( !m_bHasMessages )
-        return;
+    return m_bErrors ? wxICON_STOP
+                     : m_bWarnings ? wxICON_EXCLAMATION
+                                   : wxICON_INFORMATION;
+}

 
 

-    // do it right now to block any new calls to Flush() while we're here
-    m_bHasMessages = FALSE;
+wxString wxLogGui::GetTitle() const
+{
+    wxString titleFormat;
+    switch ( GetSeverityIcon() )
+    {
+        case wxICON_STOP:
+            titleFormat = _("%s Error");
+            break;

 
 

-    wxString appName = wxTheApp->GetAppName();
-    if ( !!appName )
-        appName[0u] = wxToupper(appName[0u]);
+        case wxICON_EXCLAMATION:
+            titleFormat = _("%s Warning");
+            break;

 
 

-    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;
+        default:
+            wxFAIL_MSG( "unexpected icon severity" );
+            // fall through
+
+        case wxICON_INFORMATION:
+            titleFormat = _("%s Information");

     }
     }

-    
-    wxString title;
-    title.Printf(titleFormat, appName.c_str());

 
 

-    // this is the best we can do here
-    wxWindow *parent = wxTheApp->GetTopWindow();
+    return wxString::Format(titleFormat, wxTheApp->GetAppDisplayName());
+}

 
 

-    size_t nMsgCount = m_aMessages.Count();
+void
+wxLogGui::DoShowSingleLogMessage(const wxString& message,
+                                 const wxString& title,
+                                 int style)
+{
+    wxMessageBox(message, title, wxOK | style);
+}

 
 

-    wxString str;
-    if ( nMsgCount == 1 )
-    {
-        str = m_aMessages[0];
-    }
-    else // more than one message
-    {
+void
+wxLogGui::DoShowMultipleLogMessages(const wxArrayString& messages,
+                                    const wxArrayInt& severities,
+                                    const wxArrayLong& times,
+                                    const wxString& title,
+                                    int style)
+{

 #if wxUSE_LOG_DIALOG
 #if wxUSE_LOG_DIALOG

-        wxLogDialog dlg(parent,
-                        m_aMessages, m_aSeverity, m_aTimes,
-                        title, style);
+    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();
+    // clear the message list before showing the dialog because while it's
+    // shown some new messages may appear
+    Clear();

 
 

-        (void)dlg.ShowModal();
+    (void)dlg.ShowModal();

 #else // !wxUSE_LOG_DIALOG
 #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
+    wxString message;
+    str.reserve(nMsgCount*100);
+    for ( size_t n = nMsgCount; n > 0; n-- ) {
+        message << 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;
+    DoShowSingleLogMessage(message, title, style);
+#endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
+}

 
 

-            nLines += (m_aMessages[n - 1].Len() + nMsgLineWidth - 1) / nMsgLineWidth;
+void wxLogGui::Flush()
+{
+    if ( !m_bHasMessages )
+        return;

 
 

-            if ( nLines > 25 )  // don't put too many lines in message box
-                break;
+    // do it right now to block any new calls to Flush() while we're here
+    m_bHasMessages = false;

 
 

-            str << m_aMessages[n - 1] << wxT("\n");
-        }
-#endif // wxUSE_LOG_DIALOG/!wxUSE_LOG_DIALOG
+    // note that this must be done before examining m_aMessages as it may log
+    // yet another message
+    const unsigned repeatCount = LogLastRepeatIfNeeded();
+
+    const size_t nMsgCount = m_aMessages.size();
+
+    if ( repeatCount > 0 )
+    {
+        m_aMessages[nMsgCount - 1] << " (" << m_aMessages[nMsgCount - 2] << ")";

     }
 
     }
 

-    // this catches both cases of 1 message with wxUSE_LOG_DIALOG and any
-    // situation without it
-    if ( !!str )
+    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();
+
+    if ( nMsgCount == 1 )

     {
     {

-        wxMessageBox(str, title, wxOK | style, parent);
+        // make a copy before calling Clear()
+        const wxString message(m_aMessages[0]);
+        Clear();
+
+        DoShowSingleLogMessage(message, title, style);
+    }
+    else // more than one message
+    {
+        wxArrayString messages;
+        wxArrayInt severities;
+        wxArrayLong times;
+
+        messages.swap(m_aMessages);
+        severities.swap(m_aSeverity);
+        times.swap(m_aTimes);

 
 

-        // no undisplayed messages whatsoever

         Clear();
         Clear();

+
+        DoShowMultipleLogMessages(messages, severities, times, title, style);

     }
     }

+
+    // allow flushing the logs again
+    Resume();

 }
 
 // log all kinds of messages
 }
 
 // log all kinds of messages

-void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+void wxLogGui::DoLog(wxLogLevel level, const wxString& szString, time_t t)

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

-                if ( !m_bErrors ) {
-                    m_aMessages.Add(szString);
-                    m_aSeverity.Add(wxLOG_Message);
-                    m_aTimes.Add((long)t);
-                    m_bHasMessages = TRUE;
-                }
+                m_aMessages.Add(szString);
+                m_aSeverity.Add(wxLOG_Message);
+                m_aTimes.Add((long)t);
+                m_bHasMessages = true;

             }
             break;
 
             }
             break;
 


@@ -361,19 +439,21 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
         case wxLOG_Debug:
             #ifdef __WXDEBUG__
             {
         case wxLOG_Debug:
             #ifdef __WXDEBUG__
             {

-                #ifdef __WXMSW__
+                wxString str;
+                TimeStamp(&str);
+                str += szString;
+
+                #if defined(__WXMSW__) && !defined(__WXMICROWIN__)

                     // don't prepend debug/trace here: it goes to the
                     // 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("\r\n");
-                    OutputDebugString(str);
+                    // debug window anyhow
+                    str += wxT("\r\n");
+                    OutputDebugString(str.wx_str());

                 #else
                     // send them to stderr
                 #else
                     // send them to stderr

-                    wxFprintf(stderr, wxT("%s: %s\n"),
+                    wxFprintf(stderr, wxT("[%s] %s\n"),

                               level == wxLOG_Trace ? wxT("Trace")
                                                    : wxT("Debug"),
                               level == wxLOG_Trace ? wxT("Trace")
                                                    : wxT("Debug"),

-                              szString);
+                              str.c_str());

                     fflush(stderr);
                 #endif
             }
                     fflush(stderr);
                 #endif
             }


@@ -397,49 +477,57 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
                 m_aSeverity.Empty();
                 m_aTimes.Empty();
 #endif // wxUSE_LOG_DIALOG
                 m_aSeverity.Empty();
                 m_aTimes.Empty();
 #endif // wxUSE_LOG_DIALOG

-                m_bErrors = TRUE;
+                m_bErrors = true;

             }
             // fall through
 
         case wxLOG_Warning:
             if ( !m_bErrors ) {
                 // for the warning we don't discard the info messages
             }
             // fall through
 
         case wxLOG_Warning:
             if ( !m_bErrors ) {
                 // for the warning we don't discard the info messages

-                m_bWarnings = TRUE;
+                m_bWarnings = true;

             }
 
             m_aMessages.Add(szString);
             m_aSeverity.Add((int)level);
             m_aTimes.Add((long)t);
             }
 
             m_aMessages.Add(szString);
             m_aSeverity.Add((int)level);
             m_aTimes.Add((long)t);

-            m_bHasMessages = TRUE;
+            m_bHasMessages = true;

             break;
     }
 }
 
             break;
     }
 }
 

+#endif   // wxUSE_LOGGUI
+

 // ----------------------------------------------------------------------------
 // wxLogWindow and wxLogFrame implementation
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxLogWindow and wxLogFrame implementation
 // ----------------------------------------------------------------------------
 

+#if wxUSE_LOGWINDOW
+

 // log frame class
 // ---------------
 class wxLogFrame : public wxFrame
 {
 public:
     // ctor & dtor
 // log frame class
 // ---------------
 class wxLogFrame : public wxFrame
 {
 public:
     // ctor & dtor

-    wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle);
+    wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle);

     virtual ~wxLogFrame();
 
     // menu callbacks
     void OnClose(wxCommandEvent& event);
     void OnCloseWindow(wxCloseEvent& event);
     virtual ~wxLogFrame();
 
     // 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);
 

-    void OnIdle(wxIdleEvent&);
+    // this function is safe to call from any thread (notice that it should be
+    // also called from the main thread to ensure that the messages logged from
+    // it appear in correct order with the messages from the other threads)
+    void AddLogMessage(const wxString& message);

 
 

-    // accessors
-    wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
+    // actually append the messages logged from secondary threads to the text
+    // control during idle time in the main thread
+    virtual void OnInternalIdle();

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


@@ -453,45 +541,68 @@ private:
     // common part of OnClose() and OnCloseWindow()
     void DoClose();
 
     // common part of OnClose() and OnCloseWindow()
     void DoClose();
 

+    // do show the message in the text control
+    void DoShowLogMessage(const wxString& message)
+    {
+        m_pTextCtrl->AppendText(message);
+    }
+

     wxTextCtrl  *m_pTextCtrl;
     wxLogWindow *m_log;
 
     wxTextCtrl  *m_pTextCtrl;
     wxLogWindow *m_log;
 

+    // queue of messages logged from other threads which need to be displayed
+    wxArrayString m_pendingMessages;
+
+#if wxUSE_THREADS
+    // critical section to protect access to m_pendingMessages
+    wxCriticalSection m_critSection;
+#endif // wxUSE_THREADS
+
+

     DECLARE_EVENT_TABLE()
     DECLARE_EVENT_TABLE()

+    DECLARE_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)
 END_EVENT_TABLE()
 
     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)
+wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle)
+          : wxFrame(pParent, wxID_ANY, szTitle)

 {
     m_log = log;
 
 {
     m_log = log;
 

-    m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
+    m_pTextCtrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,

             wxDefaultSize,
             wxTE_MULTILINE  |
             wxHSCROLL       |
             wxDefaultSize,
             wxTE_MULTILINE  |
             wxHSCROLL       |

+            // needed for Win32 to avoid 65Kb limit but it doesn't work well
+            // when using RichEdit 2.0 which we always do in the Unicode build
+#if !wxUSE_UNICODE
+            wxTE_RICH       |
+#endif // !wxUSE_UNICODE

             wxTE_READONLY);
 
             wxTE_READONLY);
 

+#if wxUSE_MENUS

     // 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"));
     pMenuBar->Append(pMenu, _("&Log"));
     SetMenuBar(pMenuBar);
     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);

+#endif // wxUSE_MENUS

 
 #if wxUSE_STATUSBAR
     // status bar for menu prompts
 
 #if wxUSE_STATUSBAR
     // status bar for menu prompts


@@ -507,7 +618,7 @@ void wxLogFrame::DoClose()
     {
         // instead of closing just hide the window to be able to Show() it
         // later
     {
         // instead of closing just hide the window to be able to Show() it
         // later

-        Show(FALSE);
+        Show(false);

     }
 }
 
     }
 }
 


@@ -521,12 +632,12 @@ void wxLogFrame::OnCloseWindow(wxCloseEvent& WXUNUSED(event))
     DoClose();
 }
 
     DoClose();
 }
 

-#if wxUSE_FILE
+#if CAN_SAVE_FILES

 void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 {
     wxString filename;
     wxFile file;
 void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
 {
     wxString filename;
     wxFile file;

-    int rc = OpenLogFile(file, &filename);
+    int rc = OpenLogFile(file, &filename, this);

     if ( rc == -1 )
     {
         // cancelled
     if ( rc == -1 )
     {
         // cancelled


@@ -550,16 +661,53 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event))
         wxLogError(_("Can't save log contents to file."));
     }
     else {
         wxLogError(_("Can't save log contents to file."));
     }
     else {

-        wxLogStatus(this, _("Log saved to the file '%s'."), filename.c_str());
+        wxLogStatus((wxFrame*)this, _("Log saved to the file '%s'."), filename.c_str());

     }
 }
     }
 }

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

 
 void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
 {
     m_pTextCtrl->Clear();
 }
 
 
 void wxLogFrame::OnClear(wxCommandEvent& WXUNUSED(event))
 {
     m_pTextCtrl->Clear();
 }
 

+void wxLogFrame::OnInternalIdle()
+{
+    {
+        wxCRIT_SECT_LOCKER(locker, m_critSection);
+
+        const size_t count = m_pendingMessages.size();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            DoShowLogMessage(m_pendingMessages[n]);
+        }
+
+        m_pendingMessages.clear();
+    } // release m_critSection
+
+    wxFrame::OnInternalIdle();
+}
+
+void wxLogFrame::AddLogMessage(const wxString& message)
+{
+    wxCRIT_SECT_LOCKER(locker, m_critSection);
+
+#if wxUSE_THREADS
+    if ( !wxThread::IsMain() || !m_pendingMessages.empty() )
+    {
+        // message needs to be queued for later showing
+        m_pendingMessages.Add(message);
+
+        wxWakeUpIdle();
+    }
+    else // we are the main thread and no messages are queued, so we can
+         // log the message directly
+#endif // wxUSE_THREADS
+    {
+        DoShowLogMessage(message);
+    }
+}
+

 wxLogFrame::~wxLogFrame()
 {
     m_log->OnFrameDelete(this);
 wxLogFrame::~wxLogFrame()
 {
     m_log->OnFrameDelete(this);


@@ -567,18 +715,18 @@ wxLogFrame::~wxLogFrame()
 
 // wxLogWindow
 // -----------
 
 // wxLogWindow
 // -----------

-wxLogWindow::wxLogWindow(wxFrame *pParent,
-                         const wxChar *szTitle,
+
+wxLogWindow::wxLogWindow(wxWindow *pParent,
+                         const wxString& szTitle,

                          bool bShow,
                          bool bDoPass)
 {
                          bool bShow,
                          bool bDoPass)
 {

-    m_bPassMessages = bDoPass;
+    PassMessages(bDoPass);

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

-    m_pOldLog = wxLog::SetActiveTarget(this);

 
     if ( bShow )
 
     if ( bShow )

-        m_pLogFrame->Show(TRUE);
+        m_pLogFrame->Show();

 }
 
 void wxLogWindow::Show(bool bShow)
 }
 
 void wxLogWindow::Show(bool bShow)


@@ -586,32 +734,21 @@ void wxLogWindow::Show(bool bShow)
     m_pLogFrame->Show(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)
+void wxLogWindow::DoLog(wxLogLevel level, const wxString& szString, time_t t)

 {
     // first let the previous logger show it
 {
     // first let the previous logger show it

-    if ( m_pOldLog != NULL && m_bPassMessages ) {
-        // bogus cast just to access protected DoLog
-        ((wxLogWindow *)m_pOldLog)->DoLog(level, szString, t);
-    }
+    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 ( m_pLogFrame ) {
         switch ( level ) {
             case wxLOG_Status:
                 // by default, these messages are ignored by wxLog, so process
                 // them ourselves

-                if ( !wxIsEmpty(szString) )
+                if ( !szString.empty() )

                 {
                     wxString str;
                     str << _("Status: ") << szString;
                 {
                     wxString str;
                     str << _("Status: ") << szString;

-                    DoLogString(str, t);
+                    LogString(str, t);

                 }
                 break;
 
                 }
                 break;
 


@@ -627,28 +764,16 @@ void wxLogWindow::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
                 wxLog::DoLog(level, szString, t);
         }
     }
                 wxLog::DoLog(level, szString, t);
         }
     }

-
-    m_bHasMessages = TRUE;

 }
 
 }
 

-void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(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__
-    long nLen = pText->GetLastPosition();
-    pText->SetSelection(nLen, nLen);
-#endif // Windows
-

     wxString msg;
     wxString msg;

+

     TimeStamp(&msg);
     msg << szString << wxT('\n');
 
     TimeStamp(&msg);
     msg << szString << wxT('\n');
 

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

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


@@ -663,7 +788,7 @@ void wxLogWindow::OnFrameCreate(wxFrame * WXUNUSED(frame))
 bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame))
 {
     // allow to close
 bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame))
 {
     // allow to close

-    return TRUE;
+    return true;

 }
 
 void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
 }
 
 void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))


@@ -673,21 +798,20 @@ void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
 
 wxLogWindow::~wxLogWindow()
 {
 
 wxLogWindow::~wxLogWindow()
 {

-    delete m_pOldLog;
-

     // may be NULL if log frame already auto destroyed itself
     delete m_pLogFrame;
 }
 
     // may be NULL if log frame already auto destroyed itself
     delete m_pLogFrame;
 }
 

+#endif // wxUSE_LOGWINDOW
+

 // ----------------------------------------------------------------------------
 // wxLogDialog
 // ----------------------------------------------------------------------------
 
 #if wxUSE_LOG_DIALOG
 
 // ----------------------------------------------------------------------------
 // wxLogDialog
 // ----------------------------------------------------------------------------
 
 #if wxUSE_LOG_DIALOG
 

-static const size_t MARGIN = 10;
-

 wxString wxLogDialog::ms_details;
 wxString wxLogDialog::ms_details;

+size_t wxLogDialog::ms_maxLength = 0;

 
 wxLogDialog::wxLogDialog(wxWindow *parent,
                          const wxArrayString& messages,
 
 wxLogDialog::wxLogDialog(wxWindow *parent,
                          const wxArrayString& messages,


@@ -695,14 +819,26 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
                          const wxArrayLong& times,
                          const wxString& caption,
                          long style)
                          const wxArrayLong& times,
                          const wxString& caption,
                          long style)

-           : wxDialog(parent, -1, caption)
+           : wxDialog(parent, wxID_ANY, caption,
+                      wxDefaultPosition, wxDefaultSize,
+                      wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)

 {
 {

-    if ( ms_details.IsEmpty() )
+    // init the static variables:
+
+    if ( ms_details.empty() )

     {
         // 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);
     {
         // 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);

+#ifdef __SMARTPHONE__
+        ms_details = wxStripMenuCodes(ms_details);
+#endif
+    }
+
+    if ( ms_maxLength == 0 )
+    {
+        ms_maxLength = (2 * wxGetDisplaySize().x/3) / GetCharWidth();

     }
 
     size_t count = messages.GetCount();
     }
 
     size_t count = messages.GetCount();


@@ -712,94 +848,108 @@ wxLogDialog::wxLogDialog(wxWindow *parent,
 
     for ( size_t n = 0; n < count; n++ )
     {
 
     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_messages.Add(messages[n]);
+        m_severity.Add(severity[n]);
+        m_times.Add(times[n]);

     }
 
     }
 

-    m_showingDetails = FALSE; // not initially
-    m_listctrl = (wxListCtrl *)NULL;
-
-#if wxUSE_STATLINE
-    m_statline = (wxStaticLine *)NULL;
-#endif // wxUSE_STATLINE
+    m_listctrl = NULL;

 
 

-#if wxUSE_FILE
-    m_btnSave = (wxButton *)NULL;
-#endif // wxUSE_FILE
+    bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);

 
     // 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
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
 
     // 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
     wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);

-    wxBoxSizer *sizerButtons = new wxBoxSizer(wxVERTICAL);
-    wxBoxSizer *sizerAll = new wxBoxSizer(wxHORIZONTAL);
+    wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL);

 
 

-    // 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, ms_details + _T(" >>"));
-    sizerButtons->Add(m_btnDetails, 0, wxCENTRE|wxTOP, MARGIN/2 - 1);
+    if (!isPda)
+    {
+        wxStaticBitmap *icon = new wxStaticBitmap
+                                   (
+                                    this,
+                                    wxID_ANY,
+                                    wxArtProvider::GetMessageBoxIcon(style)
+                                   );
+        sizerAll->Add(icon, wxSizerFlags().Centre());
+    }

 
 

-#ifndef __WIN16__
-    wxIcon icon = wxTheApp->GetStdIcon((int)(style & wxICON_MASK));
-    sizerAll->Add(new wxStaticBitmap(this, -1, icon), 0, wxCENTRE);
-#endif // !Win16
+    // create the text sizer with a minimal size so that we are sure it won't be too small
+    wxString message = EllipsizeString(messages.Last());
+    wxSizer *szText = CreateTextSizer(message);
+    szText->SetMinSize(wxMin(300, wxGetDisplaySize().x / 3), -1);

 
 

-    const wxString& message = messages.Last();
-    sizerAll->Add(CreateTextSizer(message), 0, wxCENTRE|wxLEFT|wxRIGHT, MARGIN);
-    sizerAll->Add(sizerButtons, 0, wxALIGN_RIGHT|wxLEFT, MARGIN);
+    sizerAll->Add(szText, wxSizerFlags(1).Centre().Border(wxLEFT | wxRIGHT));

 
 

-    sizerTop->Add(sizerAll, 0, wxCENTRE|wxALL, MARGIN);
+    wxButton *btnOk = new wxButton(this, wxID_OK);
+    sizerAll->Add(btnOk, wxSizerFlags().Centre());

 
 

-    SetAutoLayout(TRUE);
-    SetSizer(sizerTop);
+    sizerTop->Add(sizerAll, wxSizerFlags().Expand().Border());

 
 

-    sizerTop->SetSizeHints(this);
-    sizerTop->Fit(this);

 
 

-    btnOk->SetFocus();
+    // add the details pane
+#ifndef __SMARTPHONE__
+    wxCollapsiblePane * const
+        collpane = new wxCollapsiblePane(this, wxID_ANY, ms_details);
+    sizerTop->Add(collpane, wxSizerFlags(1).Expand().Border());

 
 

-    // 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
+    wxWindow *win = collpane->GetPane();
+    wxSizer * const paneSz = new wxBoxSizer(wxVERTICAL);
+
+    CreateDetailsControls(win);
+
+    paneSz->Add(m_listctrl, wxSizerFlags(1).Expand().Border(wxTOP));
+
+#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);
+#else // __SMARTPHONE__
+    SetLeftMenu(wxID_OK);
+    SetRightMenu(wxID_MORE, ms_details + EXPAND_SUFFIX);
+#endif // __SMARTPHONE__/!__SMARTPHONE__
+
+    SetSizerAndFit(sizerTop);

 
     Centre();
 
     Centre();

+
+    if (isPda)
+    {
+        // Move up the screen so that when we expand the dialog,
+        // there's enough space.
+        Move(wxPoint(GetPosition().x, GetPosition().y / 2));
+    }

 }
 
 }
 

-void wxLogDialog::CreateDetailsControls()
+void wxLogDialog::CreateDetailsControls(wxWindow *parent)

 {
 {

-    // 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
     // create the list ctrl now

-    m_listctrl = new wxListCtrl(this, -1,
+    m_listctrl = new wxListCtrl(parent, wxID_ANY,

                                 wxDefaultPosition, wxDefaultSize,
                                 wxSUNKEN_BORDER |
                                 wxLC_REPORT |
                                 wxLC_NO_HEADER |
                                 wxLC_SINGLE_SEL);
                                 wxDefaultPosition, wxDefaultSize,
                                 wxSUNKEN_BORDER |
                                 wxLC_REPORT |
                                 wxLC_NO_HEADER |
                                 wxLC_SINGLE_SEL);

+#ifdef __WXWINCE__
+    // This makes a big aesthetic difference on WinCE but I
+    // don't want to risk problems on other platforms
+    m_listctrl->Hide();
+#endif

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


@@ -811,33 +961,33 @@ void wxLogDialog::CreateDetailsControls()
     wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
     // order should be the same as in the switch below!
     wxImageList *imageList = new wxImageList(ICON_SIZE, ICON_SIZE);
 
     // order should be the same as in the switch below!

-    static const int icons[] =
+    static const wxChar* icons[] =

     {
     {

-        wxICON_ERROR,
-        wxICON_EXCLAMATION,
-        wxICON_INFORMATION
+        wxART_ERROR,
+        wxART_WARNING,
+        wxART_INFORMATION

     };
 
     };
 

-    bool loadedIcons = TRUE;
+    bool loadedIcons = true;

 
 

-#ifndef __WIN16__

     for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
     {
     for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
     {

-        wxBitmap bmp = wxTheApp->GetStdIcon(icons[icon]);
+        wxBitmap bmp = wxArtProvider::GetBitmap(icons[icon], wxART_MESSAGE_BOX,
+                                                wxSize(ICON_SIZE, ICON_SIZE));

 
 

-        // This may very well fail if there are insufficient
-        // colours available. Degrade gracefully.
+        // This may very well fail if there are insufficient colours available.
+        // Degrade gracefully.
+        if ( !bmp.Ok() )
+        {
+            loadedIcons = false;
+
+            break;
+        }

 
 

-        if (!bmp.Ok())
-            loadedIcons = FALSE;
-        else
-            imageList->Add(wxImage(bmp).
-                        Rescale(ICON_SIZE, ICON_SIZE).
-                         ConvertToBitmap());
+        imageList->Add(bmp);

     }
 
     m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
     }
 
     m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);

-#endif // !Win16

 
     // and fill it
     wxString fmt = wxLog::GetTimestamp();
 
     // and fill it
     wxString fmt = wxLog::GetTimestamp();


@@ -850,48 +1000,56 @@ void wxLogDialog::CreateDetailsControls()
     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++ )
     {

-        int image = -1;
-#ifndef __WIN16__
-        switch ( m_severity[n] )
+        int image;
+
+        if ( loadedIcons )

         {
         {

-            case wxLOG_Error:
-                image = 0;
-                break;
+            switch ( m_severity[n] )
+            {
+                case wxLOG_Error:
+                    image = 0;
+                    break;

 
 

-            case wxLOG_Warning:
-                image = 1;
-                break;
+                case wxLOG_Warning:
+                    image = 1;
+                    break;

 
 

-            default:
-                image = 2;
+                default:
+                    image = 2;
+            }

         }
         }

-#endif // !Win16
-
-        if (!loadedIcons)
+        else // failed to load images
+        {

             image = -1;
             image = -1;

+        }

 
 

-        if (image > -1)
-            m_listctrl->InsertItem(n, m_messages[n], image);
-        else
-            m_listctrl->InsertItem(n, m_messages[n]);
+        wxString msg = m_messages[n];
+        msg.Replace(wxT("\n"), wxT(" "));
+        msg = EllipsizeString(msg);

 
 

-        m_listctrl->SetItem(n, 1,
-                            TimeStamp(fmt, (time_t)m_times[n]));
+        m_listctrl->InsertItem(n, msg, image);
+        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);
 
     }
 
     // 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;
+    // calculate an approximately nice height for the listctrl
+    int height = GetCharHeight()*(count + 4);
+
+    // but check that the dialog won't fall fown from the screen
+    //
+    // we use GetMinHeight() to get the height of the dialog part without the
+    // details and we consider that the "Save" button below and the separator
+    // line (and the margins around it) take about as much, hence double it
+    int heightMax = wxGetDisplaySize().y - GetPosition().y - 2*GetMinHeight();
+
+    // we should leave a margin
+    heightMax *= 9;
+    heightMax /= 10;

 
 

-    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);
+    m_listctrl->SetSize(wxDefaultCoord, wxMin(height, heightMax));

 }
 
 void wxLogDialog::OnListSelect(wxListEvent& event)
 }
 
 void wxLogDialog::OnListSelect(wxListEvent& event)


@@ -902,105 +1060,88 @@ void wxLogDialog::OnListSelect(wxListEvent& event)
     m_listctrl->SetItemState(event.GetIndex(), 0, wxLIST_STATE_SELECTED);
 }
 
     m_listctrl->SetItemState(event.GetIndex(), 0, wxLIST_STATE_SELECTED);
 }
 

+void wxLogDialog::OnListItemActivated(wxListEvent& event)
+{
+    // show the activated item in a message box
+    // This allow the user to correctly display the logs which are longer
+    // than the listctrl and thus gets truncated or those which contains
+    // newlines.
+
+    // NB: don't do:
+    //    wxString str = m_listctrl->GetItemText(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)
+    // and supports long strings
+    wxMessageBox(str, wxT("Log message"), wxOK, this);
+}
+

 void wxLogDialog::OnOk(wxCommandEvent& WXUNUSED(event))
 {
     EndModal(wxID_OK);
 }
 
 void wxLogDialog::OnOk(wxCommandEvent& WXUNUSED(event))
 {
     EndModal(wxID_OK);
 }
 

-#if wxUSE_FILE
+#if CAN_SAVE_FILES || wxUSE_CLIPBOARD

 
 

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

 {
 {

-    wxFile file;
-    int rc = OpenLogFile(file);
-    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();

-
-        ok = file.Write(line);

     }
 
     }
 

-    if ( ok )
-        ok = file.Close();
-
-    if ( !ok )
-        wxLogError(_("Can't save log contents to file."));
+    return text;

 }
 
 }
 

-#endif // wxUSE_FILE
+#endif // CAN_SAVE_FILES || wxUSE_CLIPBOARD

 
 

-void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event))
-{
-    wxSizer *sizer = GetSizer();
+#if wxUSE_CLIPBOARD

 
 

-    if ( m_showingDetails )
+void wxLogDialog::OnCopy(wxCommandEvent& WXUNUSED(event))
+{
+    wxClipboardLocker clip;
+    if ( !clip ||
+            !wxTheClipboard->AddData(new wxTextDataObject(GetLogMessages())) )

     {
     {

-        m_btnDetails->SetLabel(ms_details + _T(">>"));
-
-        sizer->Remove(m_listctrl);
-
-#if wxUSE_STATLINE
-        sizer->Remove(m_statline);
-#endif // wxUSE_STATLINE
-
-#if wxUSE_FILE
-        sizer->Remove(m_btnSave);
-#endif // wxUSE_FILE
+        wxLogError(_("Failed to copy dialog contents to the clipboard."));

     }
     }

-    else // show details now
-    {
-        m_btnDetails->SetLabel(wxString(_T("<< ")) + ms_details);
-
-        if ( !m_listctrl )
-        {
-            CreateDetailsControls();
-        }
+}

 
 

-#if wxUSE_STATLINE
-        sizer->Add(m_statline, 0, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
-#endif // wxUSE_STATLINE
+#endif // wxUSE_CLIPBOARD

 
 

-        sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
+#if CAN_SAVE_FILES

 
 

-#if wxUSE_FILE
-        sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN);
-#endif // wxUSE_FILE
+void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event))
+{
+    wxFile file;
+    int rc = OpenLogFile(file, NULL, this);
+    if ( rc == -1 )
+    {
+        // cancelled
+        return;

     }
 
     }
 

-    m_showingDetails = !m_showingDetails;
-
-    // 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
+    if ( !rc || !file.Write(GetLogMessages()) || !file.Close() )
+        wxLogError(_("Can't save log contents to file."));

 }
 
 }
 

+#endif // CAN_SAVE_FILES
+

 wxLogDialog::~wxLogDialog()
 {
     if ( m_listctrl )
 wxLogDialog::~wxLogDialog()
 {
     if ( m_listctrl )


@@ -1011,17 +1152,17 @@ wxLogDialog::~wxLogDialog()
 
 #endif // wxUSE_LOG_DIALOG
 
 
 #endif // wxUSE_LOG_DIALOG
 

-#if wxUSE_FILE
+#if CAN_SAVE_FILES

 
 // pass an uninitialized file object, the function will ask the user for the
 
 // 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
+// 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
 // dialog was cancelled

-static int OpenLogFile(wxFile& file, wxString *pFilename)
+static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)

 {
     // get the file name
     // -----------------
 {
     // get the file name
     // -----------------

-    wxString filename = wxSaveFileSelector(wxT("log"), wxT("txt"), wxT("log.txt"));
+    wxString filename = wxSaveFileSelector(wxT("log"), wxT("txt"), wxT("log.txt"), parent);

     if ( !filename ) {
         // cancelled
         return -1;
     if ( !filename ) {
         // cancelled
         return -1;


@@ -1029,20 +1170,20 @@ static int OpenLogFile(wxFile& file, wxString *pFilename)
 
     // open file
     // ---------
 
     // open file
     // ---------

-    bool bOk = FALSE;
+    bool bOk;

     if ( wxFile::Exists(filename) ) {
     if ( wxFile::Exists(filename) ) {

-        bool bAppend = FALSE;
+        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:
         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;
+                bAppend = true;

                 break;
 
             case wxNO:
                 break;
 
             case wxNO:

-                bAppend = FALSE;
+                bAppend = false;

                 break;
 
             case wxCANCEL:
                 break;
 
             case wxCANCEL:


@@ -1056,7 +1197,7 @@ static int OpenLogFile(wxFile& file, wxString *pFilename)
             bOk = file.Open(filename, wxFile::write_append);
         }
         else {
             bOk = file.Open(filename, wxFile::write_append);
         }
         else {

-            bOk = file.Create(filename, TRUE /* overwrite */);
+            bOk = file.Create(filename, true /* overwrite */);

         }
     }
     else {
         }
     }
     else {


@@ -1069,6 +1210,28 @@ static int OpenLogFile(wxFile& file, wxString *pFilename)
     return bOk;
 }
 
     return bOk;
 }
 

-#endif // wxUSE_FILE
+#endif // CAN_SAVE_FILES
+
+#endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW)
+
+#if wxUSE_LOG && wxUSE_TEXTCTRL
+
+// ----------------------------------------------------------------------------
+// wxLogTextCtrl implementation
+// ----------------------------------------------------------------------------
+
+wxLogTextCtrl::wxLogTextCtrl(wxTextCtrl *pTextCtrl)
+{
+    m_pTextCtrl = pTextCtrl;
+}
+
+void wxLogTextCtrl::DoLogString(const wxString& szString, time_t WXUNUSED(t))
+{
+    wxString msg;
+    TimeStamp(&msg);
+
+    msg << szString << wxT('\n');
+    m_pTextCtrl->AppendText(msg);
+}

 
 

-#endif // wxUSE_LOG
+#endif // wxUSE_LOG && wxUSE_TEXTCTRL