mirror of https://github.com/BOINC/boinc.git
MGR: Begin fixing new Event Log to integrate properly with async RPC logic
svn path=/trunk/boinc/; revision=19995
This commit is contained in:
parent
ecab158f5d
commit
ac1e3d1115
|
@ -10454,6 +10454,7 @@ Charlie 19 Dec 2009
|
|||
clientgui/
|
||||
AdvancedFrame.cpp, .h
|
||||
DlgEventLog.cpp, .h
|
||||
Events.h
|
||||
mac_build/
|
||||
boinc.xcodeproj/
|
||||
project.pbxproj
|
||||
|
|
|
@ -1654,6 +1654,10 @@ void CAdvancedFrame::OnRefreshView(CFrameEvent& WXUNUSED(event)) {
|
|||
wxASSERT(pView);
|
||||
|
||||
pView->FireOnListRender(timerEvent);
|
||||
|
||||
if (m_pEventLog) {
|
||||
m_pEventLog->OnRefresh(timerEvent);
|
||||
}
|
||||
}
|
||||
|
||||
wxLogTrace(wxT("Function Start/End"), wxT("CAdvancedFrame::OnRefreshView - Function End"));
|
||||
|
|
|
@ -69,7 +69,6 @@ BEGIN_EVENT_TABLE( CDlgEventLog, wxDialog )
|
|||
EVT_BUTTON(ID_COPYAll, CDlgEventLog::OnMessagesCopyAll)
|
||||
EVT_BUTTON(ID_COPYSELECTED, CDlgEventLog::OnMessagesCopySelected)
|
||||
EVT_BUTTON(ID_SIMPLE_HELP, CDlgEventLog::OnButtonHelp)
|
||||
EVT_TIMER(ID_REFRESHTIMER, CDlgEventLog::OnRefresh)
|
||||
EVT_CLOSE(CDlgEventLog::OnClose)
|
||||
|
||||
////@end CDlgEventLog event table entries
|
||||
|
@ -101,12 +100,6 @@ CDlgEventLog::~CDlgEventLog() {
|
|||
|
||||
SaveState(); // Save state if close box on window frame clicked
|
||||
|
||||
if (m_pRefreshTimer) {
|
||||
m_pRefreshTimer->Stop();
|
||||
delete m_pRefreshTimer;
|
||||
m_pRefreshTimer = NULL;
|
||||
}
|
||||
|
||||
if (m_pMessageInfoAttr) {
|
||||
delete m_pMessageInfoAttr;
|
||||
m_pMessageInfoAttr = NULL;
|
||||
|
@ -167,10 +160,6 @@ bool CDlgEventLog::Create( wxWindow* parent, wxWindowID id, const wxString& capt
|
|||
// calling GetSizer()->Fit(), GetSizer()->SetSizeHints() and Center()
|
||||
RestoreState();
|
||||
|
||||
m_pRefreshTimer = new wxTimer(this, ID_REFRESHTIMER);
|
||||
wxASSERT(m_pRefreshTimer);
|
||||
m_pRefreshTimer->Start(1000); // Send event every 1 second
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -316,7 +305,7 @@ void CDlgEventLog::OnClose(wxCloseEvent& event) {
|
|||
|
||||
|
||||
/*!
|
||||
* called from CSimpleFrame::OnRefreshView()
|
||||
* called from CAdvancedFrame::OnRefreshView()
|
||||
*/
|
||||
|
||||
void CDlgEventLog::OnRefresh( wxTimerEvent& WXUNUSED(event) ) {
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
#define ID_DOCUMENTPOLLTIMER 6104
|
||||
#define ID_ALERTPOLLTIMER 6105
|
||||
#define ID_REFRESHSTATETIMER 6106
|
||||
#define ID_REFRESHTIMER 6107
|
||||
//#define ID_REFRESHTIMER 6107
|
||||
#define ID_WIZARDATTACH 6108
|
||||
#define ID_WIZARDUPDATE 6109
|
||||
#define ID_WIZARDDETACH 6110
|
||||
|
|
Loading…
Reference in New Issue