X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c9ecfbe4cdd27bd00d6ae2c43d45bbb863841d6c..a6c91f7da9cd1edc4884f915632a74c1078477b3:/src/generic/logg.cpp diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index 06dd5b23cf..9b8d9b0599 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -73,6 +73,8 @@ #include #endif +#include "wx/datetime.h" + // the suffix we add to the button to show that the dialog can be expanded #define EXPAND_SUFFIX _T(" >>") @@ -151,7 +153,7 @@ private: }; 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) @@ -251,8 +253,8 @@ void wxLogGui::Flush() 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; @@ -317,7 +319,7 @@ void wxLogGui::Flush() // 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); @@ -434,7 +436,7 @@ 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 @@ -478,7 +480,7 @@ BEGIN_EVENT_TABLE(wxLogFrame, wxFrame) EVT_CLOSE(wxLogFrame::OnCloseWindow) END_EVENT_TABLE() -wxLogFrame::wxLogFrame(wxFrame *pParent, wxLogWindow *log, const wxChar *szTitle) +wxLogFrame::wxLogFrame(wxWindow *pParent, wxLogWindow *log, const wxChar *szTitle) : wxFrame(pParent, wxID_ANY, szTitle) { m_log = log; @@ -585,7 +587,7 @@ wxLogFrame::~wxLogFrame() // wxLogWindow // ----------- -wxLogWindow::wxLogWindow(wxFrame *pParent, +wxLogWindow::wxLogWindow(wxWindow *pParent, const wxChar *szTitle, bool bShow, bool bDoPass) @@ -642,7 +644,7 @@ 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 @@ -701,7 +703,7 @@ wxLogDialog::wxLogDialog(wxWindow *parent, 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 :-) @@ -734,20 +736,19 @@ wxLogDialog::wxLogDialog(wxWindow *parent, 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); - 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 which wouldn't work otherwise (as it - // translates into click on cancel button) - wxButton *btnOk = new wxButton(this, wxID_CANCEL, wxSTOCK_OK); - sizerButtons->Add(btnOk, 0, wxCENTRE | wxBOTTOM, MARGIN/2); + wxBoxSizer *sizerButtons = new wxBoxSizer(isPda ? wxHORIZONTAL : wxVERTICAL); + wxBoxSizer *sizerAll = new wxBoxSizer(isPda ? wxVERTICAL : wxHORIZONTAL); + + 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); wxBitmap bitmap; switch ( style & wxICON_MASK ) @@ -776,13 +777,15 @@ wxLogDialog::wxLogDialog(wxWindow *parent, default: wxFAIL_MSG(_T("incorrect log style")); } - sizerAll->Add(new wxStaticBitmap(this, wxID_ANY, bitmap), 0, + + 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); + sizerAll->Add(sizerButtons, 0, isPda ? wxCENTRE|wxTOP|wxBOTTOM : (wxALIGN_RIGHT | wxLEFT), MARGIN); sizerTop->Add(sizerAll, 0, wxALL | wxEXPAND, MARGIN); @@ -804,24 +807,21 @@ wxLogDialog::wxLogDialog(wxWindow *parent, btnOk->SetFocus(); - // 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() { // create the save button and separator line if possible #if wxUSE_FILE - m_btnSave = new wxButton(this, wxID_SAVE, wxSTOCK_SAVE); + m_btnSave = new wxButton(this, wxID_SAVE); #endif // wxUSE_FILE #if wxUSE_STATLINE @@ -835,6 +835,11 @@ void wxLogDialog::CreateDetailsControls() 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) @@ -879,7 +884,7 @@ void wxLogDialog::CreateDetailsControls() if ( !fmt ) { // default format - fmt = _T("%c"); + fmt = wxDefaultDateTimeFormat; } size_t count = m_messages.GetCount(); @@ -965,7 +970,7 @@ void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event)) if ( !fmt ) { // default format - fmt = _T("%c"); + fmt = wxDefaultDateTimeFormat; } size_t count = m_messages.GetCount(); @@ -1018,7 +1023,9 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event)) } #if wxUSE_STATLINE - sizer->Add(m_statline, 0, wxEXPAND | (wxALL & ~wxTOP), MARGIN); + 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); @@ -1065,6 +1072,11 @@ void wxLogDialog::OnDetails(wxCommandEvent& WXUNUSED(event)) 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(wxDefaultCoord, size.y);