#include "wx/sizer.h"
#include "wx/statbmp.h"
#include "wx/button.h"
+ #include "wx/settings.h"
#endif // WX_PRECOMP
#if wxUSE_LOGGUI || wxUSE_LOGWINDOW
#include "wx/file.h"
#include "wx/textfile.h"
#include "wx/statline.h"
+#include "wx/artprov.h"
#ifdef __WXMSW__
// for OutputDebugString()
// we use a global variable to store the frame pointer for wxLogStatus - bad,
// but it's the easiest way
-static wxFrame *gs_pFrame; // FIXME MT-unsafe
+static wxFrame *gs_pFrame = NULL; // FIXME MT-unsafe
// ============================================================================
// implementation
// 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 wxChar *szFormat, va_list argptr)
{
wxString msg;
wxLog *pLog = wxLog::GetActiveTarget();
if ( pLog != NULL ) {
- va_list argptr;
- va_start(argptr, szFormat);
msg.PrintfV(szFormat, argptr);
- va_end(argptr);
wxASSERT( gs_pFrame == NULL ); // should be reset!
gs_pFrame = pFrame;
}
}
+void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...)
+{
+ va_list argptr;
+ va_start(argptr, szFormat);
+ wxVLogStatus(pFrame, szFormat, argptr);
+ va_end(argptr);
+}
+
// ----------------------------------------------------------------------------
// wxLogGui implementation (FIXME MT-unsafe)
// ----------------------------------------------------------------------------
wxString title;
title.Printf(titleFormat, appName.c_str());
- // this is the best we can do here
- wxWindow *parent = wxTheApp->GetTopWindow();
-
size_t nMsgCount = m_aMessages.Count();
+ // 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 wxUSE_LOG_DIALOG
- wxLogDialog dlg(parent,
+ wxLogDialog dlg(NULL,
m_aMessages, m_aSeverity, m_aTimes,
title, style);
// situation without it
if ( !!str )
{
- wxMessageBox(str, title, wxOK | style, parent);
+ wxMessageBox(str, title, wxOK | style);
// no undisplayed messages whatsoever
Clear();
}
+
+ // allow flushing the logs again
+ Resume();
}
// log all kinds of messages
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;
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, but do put a timestamp
- wxString str;
- TimeStamp(&str);
- str << szString << wxT("\r\n");
+ // debug window anyhow
+ str += wxT("\r\n");
OutputDebugString(str);
#else
// send them to stderr
- wxFprintf(stderr, wxT("%s: %s\n"),
+ wxFprintf(stderr, wxT("[%s] %s\n"),
level == wxLOG_Trace ? wxT("Trace")
: wxT("Debug"),
- szString);
+ str.c_str());
fflush(stderr);
#endif
}
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);
#if wxUSE_MENUS
// wxLogWindow
// -----------
+
wxLogWindow::wxLogWindow(wxFrame *pParent,
const wxChar *szTitle,
bool bShow,
bool bDoPass)
{
- m_bPassMessages = bDoPass;
+ PassMessages(bDoPass);
m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
- m_pOldLog = wxLog::SetActiveTarget(this);
if ( bShow )
m_pLogFrame->Show(TRUE);
m_pLogFrame->Show(bShow);
}
-void wxLogWindow::Flush()
-{
- if ( m_pOldLog != NULL )
- m_pOldLog->Flush();
-
- m_bHasMessages = FALSE;
-}
-
void wxLogWindow::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
{
// first let the previous logger show it
- if ( m_pOldLog != NULL && m_bPassMessages ) {
- // bogus cast just to access protected DoLog
- ((wxLogWindow *)m_pOldLog)->DoLog(level, szString, t);
- }
+ wxLogPassThrough::DoLog(level, szString, t);
if ( m_pLogFrame ) {
switch ( level ) {
wxLogWindow::~wxLogWindow()
{
- delete m_pOldLog;
-
// may be NULL if log frame already auto destroyed itself
delete m_pLogFrame;
}
const wxArrayLong& times,
const wxString& caption,
long style)
- : wxDialog(parent, -1, caption)
+ : wxDialog(parent, -1, caption,
+ wxDefaultPosition, wxDefaultSize,
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
{
if ( ms_details.IsEmpty() )
{
// 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);
+ 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);
+ sizerButtons->Add(m_btnDetails, 0, wxCENTRE | wxTOP, MARGIN/2 - 1);
#ifndef __WIN16__
- wxIcon icon = wxTheApp->GetStdIcon((int)(style & wxICON_MASK));
- sizerAll->Add(new wxStaticBitmap(this, -1, icon), 0, wxCENTRE);
+ wxBitmap bitmap;
+ switch ( style & wxICON_MASK )
+ {
+ case wxICON_ERROR:
+ bitmap = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX); break;
+ case wxICON_INFORMATION:
+ bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX); break;
+ case wxICON_WARNING:
+ bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX); break;
+ default:
+ wxFAIL_MSG(_T("incorrect log style"));
+ }
+ sizerAll->Add(new wxStaticBitmap(this, -1, bitmap), 0);
#endif // !Win16
const wxString& message = messages.Last();
- sizerAll->Add(CreateTextSizer(message), 0, wxCENTRE|wxLEFT|wxRIGHT, MARGIN);
- sizerAll->Add(sizerButtons, 0, wxALIGN_RIGHT|wxLEFT, MARGIN);
+ sizerAll->Add(CreateTextSizer(message), 1,
+ wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT, MARGIN);
+ sizerAll->Add(sizerButtons, 0, wxALIGN_RIGHT | wxLEFT, MARGIN);
- sizerTop->Add(sizerAll, 0, wxCENTRE|wxALL, MARGIN);
+ sizerTop->Add(sizerAll, 0, wxALL | wxEXPAND, MARGIN);
SetAutoLayout(TRUE);
SetSizer(sizerTop);
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;
#ifndef __WIN16__
for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
{
- wxBitmap bmp = wxTheApp->GetStdIcon(icons[icon]);
-
- // This may very well fail if there are insufficient
- // colours available. Degrade gracefully.
+ wxBitmap bmp = wxArtProvider::GetBitmap(icons[icon], wxART_MESSAGE_BOX,
+ wxSize(ICON_SIZE, ICON_SIZE));
- if (!bmp.Ok())
+ // This may very well fail if there are insufficient colours available.
+ // Degrade gracefully.
+ if ( !bmp.Ok() )
+ {
loadedIcons = FALSE;
- else
- imageList->Add(wxImage(bmp).
- Rescale(ICON_SIZE, ICON_SIZE).
- ConvertToBitmap());
+
+ break;
+ }
+
+ imageList->Add(bmp);
}
m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
size_t count = m_messages.GetCount();
for ( size_t n = 0; n < count; n++ )
{
- int image = -1;
+ int image;
+
#ifndef __WIN16__
- switch ( m_severity[n] )
+ 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;
+ }
}
+ else // failed to load images
#endif // !Win16
-
- if (!loadedIcons)
+ {
image = -1;
+ }
- if (image > -1)
- m_listctrl->InsertItem(n, m_messages[n], image);
- else
- m_listctrl->InsertItem(n, m_messages[n]);
-
- m_listctrl->SetItem(n, 1,
- TimeStamp(fmt, (time_t)m_times[n]));
+ m_listctrl->InsertItem(n, m_messages[n], 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);
- // 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);
- 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);
+ // 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;
+
+ m_listctrl->SetSize(-1, wxMin(height, heightMax));
}
void wxLogDialog::OnListSelect(wxListEvent& event)
if ( !ok )
wxLogError(_("Can't save log contents to file."));
-#endif
+#endif // wxUSE_FILEDLG
}
#endif // wxUSE_FILE
sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
+ // VZ: this doesn't work as this becomes the initial (and not only
+ // minimal) listctrl height as well - why?
+#if 0
+ // allow the user to make the dialog shorter than its initial height -
+ // without this it wouldn't work as the list ctrl would have been
+ // incompressible
+ sizer->SetItemMinSize(m_listctrl, 100, 3*GetCharHeight());
+#endif // 0
+
#if wxUSE_FILE
sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN);
#endif // wxUSE_FILE
wxString msg;
TimeStamp(&msg);
-#ifdef __WXMAC__
+#if defined(__WXMAC__) && !defined(__DARWIN__)
// VZ: this is a bug in wxMac, it *must* accept '\n' as new line, the
// translation must be done in wxTextCtrl, not here! (FIXME)
msg << szString << wxT('\r');
projects / wxWidgets.git / blobdiff