// 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
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// 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"
#pragma hdrstop
#endif
-#if !wxUSE_GUI
- #error "This file can't be compiled without GUI!"
-#endif
-
#ifndef WX_PRECOMP
#include "wx/app.h"
#include "wx/button.h"
#include "wx/msw/private.h"
#endif // Windows
+#ifdef __WXPM__
+ #include <time.h>
+#endif
+
#if wxUSE_LOG_DIALOG
#include "wx/listctrl.h"
#include "wx/imaglist.h"
#include "wx/msgdlg.h"
#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(" >>")
wxArrayLong m_times;
// the "toggle" button and its state
+#ifndef __SMARTPHONE__
wxButton *m_btnDetails;
+#endif
bool m_showingDetails;
// 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;
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxLogDialog)
};
BEGIN_EVENT_TABLE(wxLogDialog, wxDialog)
- EVT_BUTTON(wxID_CANCEL, wxLogDialog::OnOk)
+ EVT_BUTTON(wxID_OK, wxLogDialog::OnOk)
EVT_BUTTON(wxID_MORE, wxLogDialog::OnDetails)
#if wxUSE_FILE
EVT_BUTTON(wxID_SAVE, wxLogDialog::OnSave)
#endif // wxUSE_FILE
- EVT_LIST_ITEM_SELECTED(-1, wxLogDialog::OnListSelect)
+ EVT_LIST_ITEM_SELECTED(wxID_ANY, wxLogDialog::OnListSelect)
END_EVENT_TABLE()
#endif // wxUSE_LOG_DIALOG
#if wxUSE_FILE && wxUSE_FILEDLG
// pass an uninitialized file object, the function will ask the user for the
-// filename and try to open it, returns TRUE on success (file was opened),
-// FALSE if file couldn't be opened/created and -1 if the file selection
+// filename and try to open it, returns true on success (file was opened),
+// false if file couldn't be opened/created and -1 if the file selection
// dialog was cancelled
-static int OpenLogFile(wxFile& file, wxString *filename = NULL);
+static int OpenLogFile(wxFile& file, wxString *filename = NULL, wxWindow *parent = NULL);
#endif // wxUSE_FILE
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;
}
}
// wxLogGui implementation (FIXME MT-unsafe)
// ----------------------------------------------------------------------------
+#if wxUSE_LOGGUI
+
wxLogGui::wxLogGui()
{
Clear();
{
m_bErrors =
m_bWarnings =
- m_bHasMessages = FALSE;
+ m_bHasMessages = false;
m_aMessages.Empty();
m_aSeverity.Empty();
return;
// do it right now to block any new calls to Flush() while we're here
- m_bHasMessages = FALSE;
+ m_bHasMessages = false;
wxString appName = wxTheApp->GetAppName();
- if ( !!appName )
- appName[0u] = wxToupper(appName[0u]);
+ if ( !appName.empty() )
+ appName[0u] = (wxChar)wxToupper(appName[0u]);
long style;
wxString titleFormat;
// this catches both cases of 1 message with wxUSE_LOG_DIALOG and any
// situation without it
- if ( !!str )
+ if ( !str.empty() )
{
wxMessageBox(str, title, wxOK | style);
m_aMessages.Add(szString);
m_aSeverity.Add(wxLOG_Message);
m_aTimes.Add((long)t);
- m_bHasMessages = TRUE;
+ m_bHasMessages = true;
}
break;
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
- m_bWarnings = TRUE;
+ m_bWarnings = true;
}
m_aMessages.Add(szString);
m_aSeverity.Add((int)level);
m_aTimes.Add((long)t);
- m_bHasMessages = TRUE;
+ m_bHasMessages = true;
break;
}
}
+#endif // wxUSE_LOGGUI
+
// ----------------------------------------------------------------------------
// wxLogWindow and wxLogFrame implementation
// ----------------------------------------------------------------------------
+#if wxUSE_LOGWINDOW
+
// log frame class
// ---------------
class wxLogFrame : public wxFrame
{
public:
// ctor & dtor
- wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle);
+ wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle);
virtual ~wxLogFrame();
// menu callbacks
#endif // wxUSE_FILE
void OnClear(wxCommandEvent& event);
- void OnIdle(wxIdleEvent&);
-
// accessors
wxTextCtrl *TextCtrl() const { return m_pTextCtrl; }
wxLogWindow *m_log;
DECLARE_EVENT_TABLE()
+ DECLARE_NO_COPY_CLASS(wxLogFrame)
};
BEGIN_EVENT_TABLE(wxLogFrame, wxFrame)
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 wxChar *szTitle)
+ : wxFrame(pParent, wxID_ANY, szTitle)
{
m_log = log;
- m_pTextCtrl = new wxTextCtrl(this, -1, wxEmptyString, wxDefaultPosition,
+ m_pTextCtrl = new wxTextCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition,
wxDefaultSize,
wxTE_MULTILINE |
wxHSCROLL |
{
// instead of closing just hide the window to be able to Show() it
// later
- Show(FALSE);
+ Show(false);
}
}
#if wxUSE_FILEDLG
wxString filename;
wxFile file;
- int rc = OpenLogFile(file, &filename);
+ int rc = OpenLogFile(file, &filename, this);
if ( rc == -1 )
{
// cancelled
// wxLogWindow
// -----------
-wxLogWindow::wxLogWindow(wxFrame *pParent,
+wxLogWindow::wxLogWindow(wxWindow *pParent,
const wxChar *szTitle,
bool bShow,
bool bDoPass)
m_pLogFrame = new wxLogFrame(pParent, this, szTitle);
if ( bShow )
- m_pLogFrame->Show(TRUE);
+ m_pLogFrame->Show();
}
void wxLogWindow::Show(bool bShow)
wxLog::DoLog(level, szString, t);
}
}
-
- m_bHasMessages = TRUE;
}
void wxLogWindow::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
// remove selection (WriteText is in fact ReplaceSelection)
#ifdef __WXMSW__
- long nLen = pText->GetLastPosition();
+ wxTextPos nLen = pText->GetLastPosition();
pText->SetSelection(nLen, nLen);
#endif // Windows
bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame))
{
// allow to close
- return TRUE;
+ return true;
}
void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame))
delete m_pLogFrame;
}
+#endif // wxUSE_LOGWINDOW
+
// ----------------------------------------------------------------------------
// wxLogDialog
// ----------------------------------------------------------------------------
#if wxUSE_LOG_DIALOG
+#ifndef __SMARTPHONE__
static const size_t MARGIN = 10;
+#else
+static const size_t MARGIN = 0;
+#endif
wxString wxLogDialog::ms_details;
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() )
+ 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);
+#ifdef __SMARTPHONE__
+ ms_details = wxStripMenuCodes(ms_details);
+#endif
}
size_t count = messages.GetCount();
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 );
+ msg.Replace(wxT("\n"), wxT(" "));
+ m_messages.Add(msg);
+ m_severity.Add(severity[n]);
+ m_times.Add(times[n]);
}
- m_showingDetails = FALSE; // not initially
+ m_showingDetails = false; // not initially
m_listctrl = (wxListCtrl *)NULL;
+#ifndef __SMARTPHONE__
+
#if wxUSE_STATLINE
m_statline = (wxStaticLine *)NULL;
#endif // wxUSE_STATLINE
m_btnSave = (wxButton *)NULL;
#endif // wxUSE_FILE
+#endif // __SMARTPHONE__
+
+ 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);
- wxBoxSizer *sizerButtons = new wxBoxSizer(wxVERTICAL);
- wxBoxSizer *sizerAll = new wxBoxSizer(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);
+#ifndef __SMARTPHONE__
+ wxBoxSizer *sizerButtons = new wxBoxSizer(isPda ? wxHORIZONTAL : wxVERTICAL);
+#endif
+ wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL);
+
+#ifdef __SMARTPHONE__
+ SetLeftMenu(wxID_OK);
+ SetRightMenu(wxID_MORE, ms_details + EXPAND_SUFFIX);
+#else
+ wxButton *btnOk = new wxButton(this, wxID_OK);
+ sizerButtons->Add(btnOk, 0, isPda ? wxCENTRE : wxCENTRE|wxBOTTOM, MARGIN/2);
m_btnDetails = new wxButton(this, wxID_MORE, ms_details + EXPAND_SUFFIX);
- sizerButtons->Add(m_btnDetails, 0, wxCENTRE | wxTOP, MARGIN/2 - 1);
+ sizerButtons->Add(m_btnDetails, 0, isPda ? wxCENTRE|wxLEFT : wxCENTRE | wxTOP, MARGIN/2 - 1);
+#endif
-#ifndef __WIN16__
wxBitmap bitmap;
switch ( style & wxICON_MASK )
{
case wxICON_ERROR:
- bitmap = wxArtProvider::GetIcon(wxART_ERROR, wxART_MESSAGE_BOX); break;
+ bitmap = wxArtProvider::GetBitmap(wxART_ERROR, wxART_MESSAGE_BOX);
+#ifdef __WXPM__
+ bitmap.SetId(wxICON_SMALL_ERROR);
+#endif
+ break;
+
case wxICON_INFORMATION:
- bitmap = wxArtProvider::GetIcon(wxART_INFORMATION, wxART_MESSAGE_BOX); break;
+ bitmap = wxArtProvider::GetBitmap(wxART_INFORMATION, wxART_MESSAGE_BOX);
+#ifdef __WXPM__
+ bitmap.SetId(wxICON_SMALL_INFO);
+#endif
+ break;
+
case wxICON_WARNING:
- bitmap = wxArtProvider::GetIcon(wxART_WARNING, wxART_MESSAGE_BOX); break;
+ bitmap = wxArtProvider::GetBitmap(wxART_WARNING, wxART_MESSAGE_BOX);
+#ifdef __WXPM__
+ bitmap.SetId(wxICON_SMALL_WARNING);
+#endif
+ break;
+
default:
wxFAIL_MSG(_T("incorrect log style"));
}
- sizerAll->Add(new wxStaticBitmap(this, -1, bitmap), 0);
-#endif // !Win16
+
+ if (!isPda)
+ sizerAll->Add(new wxStaticBitmap(this, wxID_ANY, bitmap), 0,
+ wxALIGN_CENTRE_VERTICAL);
const wxString& message = messages.Last();
sizerAll->Add(CreateTextSizer(message), 1,
wxALIGN_CENTRE_VERTICAL | wxLEFT | wxRIGHT, MARGIN);
- sizerAll->Add(sizerButtons, 0, wxALIGN_RIGHT | wxLEFT, MARGIN);
+#ifndef __SMARTPHONE__
+ sizerAll->Add(sizerButtons, 0, isPda ? wxCENTRE|wxTOP|wxBOTTOM : (wxALIGN_RIGHT | wxLEFT), MARGIN);
+#endif
sizerTop->Add(sizerAll, 0, wxALL | wxEXPAND, MARGIN);
- SetAutoLayout(TRUE);
SetSizer(sizerTop);
// see comments in OnDetails()
m_maxHeight = size.y;
SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
+#ifndef __SMARTPHONE__
btnOk->SetFocus();
+#endif
- // this can't happen any more as we don't use this dialog in this case
-#if 0
- if ( count == 1 )
+ Centre();
+
+ if (isPda)
{
- // 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();
+ // Move up the screen so that when we expand the dialog,
+ // there's enough space.
+ Move(wxPoint(GetPosition().x, GetPosition().y / 2));
}
-#endif // 0
-
- Centre();
}
void wxLogDialog::CreateDetailsControls()
{
+#ifndef __SMARTPHONE__
// create the save button and separator line if possible
#if wxUSE_FILE
- m_btnSave = new wxButton(this, wxID_SAVE, _("&Save..."));
+ m_btnSave = new wxButton(this, wxID_SAVE);
#endif // wxUSE_FILE
#if wxUSE_STATLINE
- m_statline = new wxStaticLine(this, -1);
+ m_statline = new wxStaticLine(this, wxID_ANY);
#endif // wxUSE_STATLINE
+#endif // __SMARTPHONE__
+
// create the list ctrl now
- m_listctrl = new wxListCtrl(this, -1,
+ m_listctrl = new wxListCtrl(this, wxID_ANY,
wxDefaultPosition, wxDefaultSize,
wxSUNKEN_BORDER |
wxLC_REPORT |
wxLC_NO_HEADER |
wxLC_SINGLE_SEL);
+#ifdef __WXWINCE__
+ // This maks 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)
wxART_INFORMATION
};
- bool loadedIcons = TRUE;
+ bool loadedIcons = true;
-#ifndef __WIN16__
for ( size_t icon = 0; icon < WXSIZEOF(icons); icon++ )
{
wxBitmap bmp = wxArtProvider::GetBitmap(icons[icon], wxART_MESSAGE_BOX,
// Degrade gracefully.
if ( !bmp.Ok() )
{
- loadedIcons = FALSE;
+ loadedIcons = false;
break;
}
}
m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL);
-#endif // !Win16
// and fill it
wxString fmt = wxLog::GetTimestamp();
{
int image;
-#ifndef __WIN16__
if ( loadedIcons )
{
switch ( m_severity[n] )
}
}
else // failed to load images
-#endif // !Win16
{
image = -1;
}
heightMax *= 9;
heightMax /= 10;
- m_listctrl->SetSize(-1, wxMin(height, heightMax));
+ m_listctrl->SetSize(wxDefaultCoord, wxMin(height, heightMax));
}
void wxLogDialog::OnListSelect(wxListEvent& event)
{
#if wxUSE_FILEDLG
wxFile file;
- int rc = OpenLogFile(file);
+ int rc = OpenLogFile(file, NULL, this);
if ( rc == -1 )
{
// cancelled
if ( m_showingDetails )
{
+#ifdef __SMARTPHONE__
+ SetRightMenu(wxID_MORE, ms_details + EXPAND_SUFFIX);
+#else
m_btnDetails->SetLabel(ms_details + EXPAND_SUFFIX);
+#endif
- sizer->Remove(m_listctrl);
+ sizer->Detach( m_listctrl );
+
+#ifndef __SMARTPHONE__
#if wxUSE_STATLINE
- sizer->Remove(m_statline);
+ sizer->Detach( m_statline );
#endif // wxUSE_STATLINE
#if wxUSE_FILE
- sizer->Remove(m_btnSave);
+ sizer->Detach( m_btnSave );
#endif // wxUSE_FILE
+
+#endif // __SMARTPHONE__
}
else // show details now
{
+#ifdef __SMARTPHONE__
+ SetRightMenu(wxID_MORE, wxString(_T("<< ")) + ms_details);
+#else
m_btnDetails->SetLabel(wxString(_T("<< ")) + ms_details);
+#endif
if ( !m_listctrl )
{
CreateDetailsControls();
}
-#if wxUSE_STATLINE
- sizer->Add(m_statline, 0, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
+#if wxUSE_STATLINE && !defined(__SMARTPHONE__)
+ bool isPda = (wxSystemSettings::GetScreenType() <= wxSYS_SCREEN_PDA);
+ if (!isPda)
+ sizer->Add(m_statline, 0, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
#endif // wxUSE_STATLINE
sizer->Add(m_listctrl, 1, wxEXPAND | (wxALL & ~wxTOP), MARGIN);
sizer->SetItemMinSize(m_listctrl, 100, 3*GetCharHeight());
#endif // 0
-#if wxUSE_FILE
+#if wxUSE_FILE && !defined(__SMARTPHONE__)
sizer->Add(m_btnSave, 0, wxALIGN_RIGHT | (wxALL & ~wxTOP), MARGIN);
#endif // wxUSE_FILE
}
SetSizeHints(size.x, size.y, m_maxWidth, m_maxHeight);
+#ifdef __WXWINCE__
+ if (m_showingDetails)
+ m_listctrl->Show();
+#endif
+
// don't change the width when expanding/collapsing
- SetSize(-1, size.y);
+ SetSize(wxDefaultCoord, size.y);
#ifdef __WXGTK__
- // VS: this is neccessary in order to force frame redraw under
+ // VS: this is necessary in order to force frame redraw under
// WindowMaker or fvwm2 (and probably other broken WMs).
// Otherwise, detailed list wouldn't be displayed.
- Show(TRUE);
+ Show();
#endif // wxGTK
}
#if wxUSE_FILE && wxUSE_FILEDLG
// pass an uninitialized file object, the function will ask the user for the
-// filename and try to open it, returns TRUE on success (file was opened),
-// FALSE if file couldn't be opened/created and -1 if the file selection
+// filename and try to open it, returns true on success (file was opened),
+// false if file couldn't be opened/created and -1 if the file selection
// dialog was cancelled
-static int OpenLogFile(wxFile& file, wxString *pFilename)
+static int OpenLogFile(wxFile& file, wxString *pFilename, wxWindow *parent)
{
// 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;
// open file
// ---------
- bool bOk = FALSE;
+ bool bOk wxDUMMY_INITIALIZE(false);
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:
- bAppend = TRUE;
+ bAppend = true;
break;
case wxNO:
- bAppend = FALSE;
+ bAppend = false;
break;
case wxCANCEL:
bOk = file.Open(filename, wxFile::write_append);
}
else {
- bOk = file.Create(filename, TRUE /* overwrite */);
+ bOk = file.Create(filename, true /* overwrite */);
}
}
else {
#endif // !(wxUSE_LOGGUI || wxUSE_LOGWINDOW)
-#if wxUSE_TEXTCTRL
+#if wxUSE_LOG && wxUSE_TEXTCTRL
// ----------------------------------------------------------------------------
// wxLogTextCtrl implementation
wxString msg;
TimeStamp(&msg);
-#if defined(__WXMAC__)
- // VZ: this is a bug in wxMac, it *must* accept '\n' as new line, the
- // translation must be done in wxTextCtrl, not here! (FIXME)
- msg << szString << wxT('\r');
-#else
msg << szString << wxT('\n');
-#endif
-
m_pTextCtrl->AppendText(msg);
}
-#endif // wxUSE_TEXTCTRL
+#endif // wxUSE_LOG && wxUSE_TEXTCTRL
-// vi:sts=4:sw=4:et
projects / wxWidgets.git / blobdiff