#include "wx/sizer.h"
#include "wx/statbmp.h"
#include "wx/settings.h"
+ #include "wx/wxcrtvararg.h"
#endif // WX_PRECOMP
#if wxUSE_LOGGUI || wxUSE_LOGWINDOW
#include "wx/statline.h"
#include "wx/artprov.h"
#include "wx/collpane.h"
+#include "wx/arrstr.h"
+
+#if wxUSE_THREADS
+ #include "wx/thread.h"
+#endif // wxUSE_THREADS
#ifdef __WXMSW__
// for OutputDebugString()
#include "wx/msw/private.h"
#endif // Windows
+
#ifdef __WXPM__
#include <time.h>
#endif
// 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];
// accepts an additional argument which tells to which frame the output should
// be directed
-void wxVLogStatus(wxFrame *pFrame, const wxChar *szFormat, va_list argptr)
+void wxVLogStatus(wxFrame *pFrame, const wxString& format, va_list argptr)
{
wxString msg;
wxLog *pLog = wxLog::GetActiveTarget();
if ( pLog != NULL ) {
- msg.PrintfV(szFormat, argptr);
+ msg.PrintfV(format, argptr);
wxASSERT( gs_pFrame == NULL ); // should be reset!
gs_pFrame = pFrame;
}
}
-void wxDoLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
+#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, szFormat);
- wxVLogStatus(pFrame, szFormat, argptr);
+ va_start(argptr, format);
+ wxVLogStatus(pFrame, format, argptr);
va_end(argptr);
}
+#endif // wxUSE_UNICODE_UTF8
// ----------------------------------------------------------------------------
// wxLogGui implementation (FIXME MT-unsafe)
// do it right now to block any new calls to Flush() while we're here
m_bHasMessages = false;
- unsigned repeatCount = 0;
- if ( wxLog::GetRepetitionCounting() )
- {
- repeatCount = wxLog::DoLogNumberOfRepeats();
- }
+ const unsigned repeatCount = LogLastRepeatIfNeeded();
- wxString appName = wxTheApp->GetAppName();
- if ( !appName.empty() )
- appName[0u] = (wxChar)wxToupper(appName[0u]);
+ wxString appName = wxTheApp->GetAppDisplayName();
long style;
wxString titleFormat;
wxString title;
title.Printf(titleFormat, appName.c_str());
- size_t nMsgCount = m_aMessages.Count();
+ size_t nMsgCount = m_aMessages.GetCount();
// 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!
#if wxUSE_LOG_DIALOG
if ( repeatCount > 0 )
- m_aMessages[nMsgCount-1] += wxString::Format(wxT(" (%s)"), m_aMessages[nMsgCount-2].c_str());
+ {
+ m_aMessages[nMsgCount - 1]
+ << " (" << m_aMessages[nMsgCount - 2] << ")";
+ }
+
wxLogDialog dlg(NULL,
m_aMessages, m_aSeverity, m_aTimes,
title, style);
}
// 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:
// don't prepend debug/trace here: it goes to the
// debug window anyhow
str += wxT("\r\n");
- OutputDebugString(str);
+ OutputDebugString(str.wx_str());
#else
// send them to stderr
wxFprintf(stderr, wxT("[%s] %s\n"),
{
public:
// ctor & dtor
- wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle);
+ wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle);
virtual ~wxLogFrame();
// menu callbacks
#endif // wxUSE_FILE
void OnClear(wxCommandEvent& event);
- // accessors
- wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
+ // 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);
+
+ // 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!
// 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;
+ // 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_NO_COPY_CLASS(wxLogFrame)
};
EVT_CLOSE(wxLogFrame::OnCloseWindow)
END_EVENT_TABLE()
-wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle)
+wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxString& szTitle)
: wxFrame(pParent, wxID_ANY, szTitle)
{
m_log = log;
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
}
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);
// -----------
wxLogWindow::wxLogWindow(wxWindow *pParent,
- const wxChar *szTitle,
+ const wxString& szTitle,
bool bShow,
bool bDoPass)
{
m_pLogFrame->Show(bShow);
}
-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
wxLogPassThrough::DoLog(level, szString, t);
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;
- DoLogString(str, t);
+ LogString(str, t);
}
break;
}
}
-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__
- wxTextPos nLen = pText->GetLastPosition();
- pText->SetSelection(nLen, nLen);
-#endif // Windows
-
wxString msg;
+
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
wxBoxSizer *sizerTop = new wxBoxSizer(wxVERTICAL);
wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL);
- wxBitmap bitmap;
- switch ( style & wxICON_MASK )
+ if (!isPda)
{
- case wxICON_ERROR:
- bitmap = wxArtProvider::GetBitmap(wxART_ERROR, wxART_MESSAGE_BOX);
-#ifdef __WXPM__
- bitmap.SetId(wxICON_SMALL_ERROR);
-#endif
- break;
-
- case wxICON_INFORMATION:
- bitmap = wxArtProvider::GetBitmap(wxART_INFORMATION, wxART_MESSAGE_BOX);
-#ifdef __WXPM__
- bitmap.SetId(wxICON_SMALL_INFO);
-#endif
- break;
-
- case wxICON_WARNING:
- bitmap = wxArtProvider::GetBitmap(wxART_WARNING, wxART_MESSAGE_BOX);
-#ifdef __WXPM__
- bitmap.SetId(wxICON_SMALL_WARNING);
-#endif
- break;
-
- default:
- wxFAIL_MSG(_T("incorrect log style"));
+ wxStaticBitmap *icon = new wxStaticBitmap
+ (
+ this,
+ wxID_ANY,
+ wxArtProvider::GetMessageBoxIcon(style)
+ );
+ sizerAll->Add(icon, 0, wxALIGN_CENTRE_VERTICAL);
}
- if (!isPda)
- sizerAll->Add(new wxStaticBitmap(this, wxID_ANY, bitmap), 0,
- wxALIGN_CENTRE_VERTICAL);
-
// 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);
// 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);
}
// open file
// ---------
- bool bOk wxDUMMY_INITIALIZE(false);
+ bool bOk = false;
if ( wxFile::Exists(filename) ) {
bool bAppend = false;
wxString strMsg;
m_pTextCtrl = pTextCtrl;
}
-void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+void wxLogTextCtrl::DoLogString(const wxString& szString, time_t WXUNUSED(t))
{
wxString msg;
TimeStamp(&msg);
projects / wxWidgets.git / blobdiff