X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5180055b697078e8c6ec7db485f1f1bfa3e91abd..b60f5ca56d21a18b0294ed8b2769cdec0142ef70:/src/generic/logg.cpp diff --git a/src/generic/logg.cpp b/src/generic/logg.cpp index b56c4ef1cd..9b8d9b0599 100644 --- a/src/generic/logg.cpp +++ b/src/generic/logg.cpp @@ -18,7 +18,7 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "logg.h" #endif @@ -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(" >>") @@ -86,6 +88,10 @@ // allows to exclude the usage of wxDateTime static wxString TimeStamp(const wxChar *format, time_t t) { +#ifdef __WXWINCE__ + // FIXME + return wxEmptyString; +#else wxChar buf[4096]; if ( !wxStrftime(buf, WXSIZEOF(buf), format, localtime(&t)) ) { @@ -93,6 +99,7 @@ static wxString TimeStamp(const wxChar *format, time_t t) wxFAIL_MSG(_T("strftime() failed")); } return wxString(buf); +#endif } @@ -146,12 +153,12 @@ 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) #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 @@ -163,10 +170,10 @@ END_EVENT_TABLE() #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 @@ -198,7 +205,11 @@ void wxVLogStatus(wxFrame *pFrame, const wxChar *szFormat, va_list argptr) 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; } } @@ -215,6 +226,8 @@ void wxLogStatus(wxFrame *pFrame, const wxChar *szFormat, ...) // wxLogGui implementation (FIXME MT-unsafe) // ---------------------------------------------------------------------------- +#if wxUSE_LOGGUI + wxLogGui::wxLogGui() { Clear(); @@ -224,7 +237,7 @@ void wxLogGui::Clear() { m_bErrors = m_bWarnings = - m_bHasMessages = FALSE; + m_bHasMessages = false; m_aMessages.Empty(); m_aSeverity.Empty(); @@ -237,11 +250,11 @@ void wxLogGui::Flush() 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; @@ -306,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); @@ -329,7 +342,7 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t) m_aMessages.Add(szString); m_aSeverity.Add(wxLOG_Message); m_aTimes.Add((long)t); - m_bHasMessages = TRUE; + m_bHasMessages = true; } break; @@ -393,24 +406,26 @@ void wxLogGui::DoLog(wxLogLevel level, const wxChar *szString, time_t t) 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 // ---------------------------------------------------------------------------- @@ -421,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 @@ -465,12 +480,12 @@ 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 | @@ -509,7 +524,7 @@ void wxLogFrame::DoClose() { // instead of closing just hide the window to be able to Show() it // later - Show(FALSE); + Show(false); } } @@ -529,7 +544,7 @@ void wxLogFrame::OnSave(wxCommandEvent& WXUNUSED(event)) #if wxUSE_FILEDLG wxString filename; wxFile file; - int rc = OpenLogFile(file, &filename); + int rc = OpenLogFile(file, &filename, this); if ( rc == -1 ) { // cancelled @@ -572,7 +587,7 @@ wxLogFrame::~wxLogFrame() // wxLogWindow // ----------- -wxLogWindow::wxLogWindow(wxFrame *pParent, +wxLogWindow::wxLogWindow(wxWindow *pParent, const wxChar *szTitle, bool bShow, bool bDoPass) @@ -582,7 +597,7 @@ wxLogWindow::wxLogWindow(wxFrame *pParent, m_pLogFrame = new wxLogFrame(pParent, this, szTitle); if ( bShow ) - m_pLogFrame->Show(TRUE); + m_pLogFrame->Show(); } void wxLogWindow::Show(bool bShow) @@ -629,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 @@ -654,7 +669,7 @@ void wxLogWindow::OnFrameCreate(wxFrame * WXUNUSED(frame)) bool wxLogWindow::OnFrameClose(wxFrame * WXUNUSED(frame)) { // allow to close - return TRUE; + return true; } void wxLogWindow::OnFrameDelete(wxFrame * WXUNUSED(frame)) @@ -684,11 +699,11 @@ wxLogDialog::wxLogDialog(wxWindow *parent, 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 :-) @@ -704,18 +719,13 @@ wxLogDialog::wxLogDialog(wxWindow *parent, 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; #if wxUSE_STATLINE @@ -726,22 +736,20 @@ 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, _("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); -#ifndef __WIN16__ wxBitmap bitmap; switch ( style & wxICON_MASK ) { @@ -769,17 +777,18 @@ wxLogDialog::wxLogDialog(wxWindow *parent, 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); + sizerAll->Add(sizerButtons, 0, isPda ? wxCENTRE|wxTOP|wxBOTTOM : (wxALIGN_RIGHT | wxLEFT), MARGIN); sizerTop->Add(sizerAll, 0, wxALL | wxEXPAND, MARGIN); - SetAutoLayout(TRUE); SetSizer(sizerTop); // see comments in OnDetails() @@ -798,37 +807,39 @@ 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, _("&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 // 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) @@ -847,9 +858,8 @@ void wxLogDialog::CreateDetailsControls() 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, @@ -859,7 +869,7 @@ void wxLogDialog::CreateDetailsControls() // Degrade gracefully. if ( !bmp.Ok() ) { - loadedIcons = FALSE; + loadedIcons = false; break; } @@ -868,14 +878,13 @@ void wxLogDialog::CreateDetailsControls() } m_listctrl->SetImageList(imageList, wxIMAGE_LIST_SMALL); -#endif // !Win16 // and fill it wxString fmt = wxLog::GetTimestamp(); if ( !fmt ) { // default format - fmt = _T("%c"); + fmt = wxDefaultDateTimeFormat; } size_t count = m_messages.GetCount(); @@ -883,7 +892,6 @@ void wxLogDialog::CreateDetailsControls() { int image; -#ifndef __WIN16__ if ( loadedIcons ) { switch ( m_severity[n] ) @@ -901,7 +909,6 @@ void wxLogDialog::CreateDetailsControls() } } else // failed to load images -#endif // !Win16 { image = -1; } @@ -928,7 +935,7 @@ void wxLogDialog::CreateDetailsControls() heightMax *= 9; heightMax /= 10; - m_listctrl->SetSize(-1, wxMin(height, heightMax)); + m_listctrl->SetSize(wxDefaultCoord, wxMin(height, heightMax)); } void wxLogDialog::OnListSelect(wxListEvent& event) @@ -950,7 +957,7 @@ void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event)) { #if wxUSE_FILEDLG wxFile file; - int rc = OpenLogFile(file); + int rc = OpenLogFile(file, NULL, this); if ( rc == -1 ) { // cancelled @@ -963,7 +970,7 @@ void wxLogDialog::OnSave(wxCommandEvent& WXUNUSED(event)) if ( !fmt ) { // default format - fmt = _T("%c"); + fmt = wxDefaultDateTimeFormat; } size_t count = m_messages.GetCount(); @@ -1016,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); @@ -1063,14 +1072,19 @@ 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(-1, size.y); + SetSize(wxDefaultCoord, size.y); #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); + Show(); #endif // wxGTK } @@ -1087,14 +1101,14 @@ wxLogDialog::~wxLogDialog() #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; @@ -1102,20 +1116,20 @@ static int OpenLogFile(wxFile& file, wxString *pFilename) // open file // --------- - bool bOk = FALSE; + bool bOk; 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: @@ -1129,7 +1143,7 @@ static int OpenLogFile(wxFile& file, wxString *pFilename) bOk = file.Open(filename, wxFile::write_append); } else { - bOk = file.Create(filename, TRUE /* overwrite */); + bOk = file.Create(filename, true /* overwrite */); } } else { @@ -1162,14 +1176,7 @@ void wxLogTextCtrl::DoLogString(const wxChar *szString, time_t WXUNUSED(t)) 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); }