diff --git a/checkin_notes b/checkin_notes index e70ba8a44d..5416fc9a10 100644 --- a/checkin_notes +++ b/checkin_notes @@ -10427,3 +10427,10 @@ Charlie 19 Dec 2009 mac_build/ boinc.xcodeproj/ project.pbxproj + +Rom 19 Dec 2009 + - MGR: Convert the event log to a modeless dialog. + + clientgui/ + AdvancedFrame.cpp, .h + DlgEventLog.cpp diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp index ee1749a161..6592eca046 100644 --- a/clientgui/AdvancedFrame.cpp +++ b/clientgui/AdvancedFrame.cpp @@ -209,6 +209,7 @@ CAdvancedFrame::CAdvancedFrame(wxString title, wxIcon* icon, wxIcon* icon32, wxP m_pMenubar = NULL; m_pNotebook = NULL; m_pStatusbar = NULL; + m_pEventLog = NULL; // Working Variables m_strBaseTitle = title; @@ -234,7 +235,6 @@ CAdvancedFrame::CAdvancedFrame(wxString title, wxIcon* icon, wxIcon* icon32, wxP wxASSERT(m_pFrameRenderTimer); m_pFrameRenderTimer->Start(1000); // Send event every 1 second - wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::CAdvancedFrame - Function End")); } @@ -1573,8 +1573,8 @@ void CAdvancedFrame::OnReadPreferences(wxCommandEvent& WXUNUSED(event)) { void CAdvancedFrame::OnEventLog(wxCommandEvent& WXUNUSED(event)) { wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnEventLog - Function Begin")); - CDlgEventLog dlg(this); - dlg.ShowModal(); + m_pEventLog = new CDlgEventLog(this); + m_pEventLog->Show(); wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnEventLog - Function End")); } diff --git a/clientgui/AdvancedFrame.h b/clientgui/AdvancedFrame.h index 859dbc2acc..bc0470254a 100644 --- a/clientgui/AdvancedFrame.h +++ b/clientgui/AdvancedFrame.h @@ -25,6 +25,7 @@ class CBOINCBaseView; +class CDlgEventLog; /// /// Bitmask values for CMainDocument::RunPeriodicRPCs() @@ -123,6 +124,7 @@ private: wxMenuBar* m_pMenubar; wxNotebook* m_pNotebook; CStatusBar* m_pStatusbar; + CDlgEventLog* m_pEventLog; wxString m_strBaseTitle; diff --git a/clientgui/DlgEventLog.cpp b/clientgui/DlgEventLog.cpp index 079fad79a3..5aa64576db 100644 --- a/clientgui/DlgEventLog.cpp +++ b/clientgui/DlgEventLog.cpp @@ -294,7 +294,7 @@ void CDlgEventLog::OnHelp(wxHelpEvent& event) { void CDlgEventLog::OnOK( wxCommandEvent& /*event*/ ) { SaveState(); - EndModal(wxID_OK); + Hide(); }