mirror of https://github.com/BOINC/boinc.git
- MGR: Reenable the refresh timer local to CDlgEventLog, but do not
issue an RPC, determine the size by asking the vector. clientgui/ DlgEventLog.cpp, .h svn path=/trunk/boinc/; revision=20018
This commit is contained in:
parent
5863f88922
commit
0c1d69f057
|
@ -10604,3 +10604,11 @@ Rom 22 Dec 2009
|
|||
|
||||
clientgui/
|
||||
DlgEventLog.cpp, .h
|
||||
|
||||
Rom 22 Dec 2009
|
||||
- MGR: Reenable the refresh timer local to CDlgEventLog, but do not
|
||||
issue an RPC, determine the size by asking the vector.
|
||||
|
||||
clientgui/
|
||||
DlgEventLog.cpp, .h
|
||||
|
||||
|
|
|
@ -69,8 +69,8 @@ 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
|
||||
END_EVENT_TABLE()
|
||||
|
||||
|
@ -103,6 +103,11 @@ CDlgEventLog::~CDlgEventLog() {
|
|||
m_pMessageErrorAttr = NULL;
|
||||
}
|
||||
|
||||
if (m_pRefreshTimer) {
|
||||
m_pRefreshTimer->Stop();
|
||||
delete m_pRefreshTimer;
|
||||
}
|
||||
|
||||
wxGetApp().CloseEventLog();
|
||||
|
||||
wxLogTrace(wxT("Function Start/End"), wxT("CDlgEventLog::CDlgEventLog - Destructor Function End"));
|
||||
|
@ -151,6 +156,11 @@ bool CDlgEventLog::Create( wxWindow* WXUNUSED(parent), wxWindowID id, const wxSt
|
|||
// calling GetSizer()->Fit(), GetSizer()->SetSizeHints() and Center()
|
||||
RestoreState();
|
||||
|
||||
m_pRefreshTimer = new wxTimer(this, ID_REFRESHTIMER);
|
||||
if (m_pRefreshTimer) {
|
||||
m_pRefreshTimer->Start(1000);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -296,7 +306,7 @@ void CDlgEventLog::OnClose(wxCloseEvent& WXUNUSED(event)) {
|
|||
|
||||
|
||||
/*!
|
||||
* called from CAdvancedFrame::OnRefreshView()
|
||||
* wxEVT_TIMER event handler for CDlgEventLog
|
||||
*/
|
||||
|
||||
void CDlgEventLog::OnRefresh( wxTimerEvent& WXUNUSED(event) ) {
|
||||
|
@ -308,7 +318,7 @@ void CDlgEventLog::OnRefresh( wxTimerEvent& WXUNUSED(event) ) {
|
|||
|
||||
wxASSERT(m_pList);
|
||||
|
||||
wxInt32 iDocCount = wxGetApp().GetDocument()->GetMessageCount();
|
||||
wxInt32 iDocCount = wxGetApp().GetDocument()->messages.messages.size();
|
||||
if (0 >= iDocCount) {
|
||||
m_pList->DeleteAllItems();
|
||||
} else {
|
||||
|
|
|
@ -65,7 +65,6 @@ class CDlgEventLogListCtrl;
|
|||
#define wxFIXED_MINSIZE 0
|
||||
#endif
|
||||
|
||||
|
||||
class CDlgEventLog : public wxDialog
|
||||
{
|
||||
DECLARE_DYNAMIC_CLASS( CDlgEventLog )
|
||||
|
@ -89,9 +88,6 @@ public:
|
|||
/// wxEVT_SHOW event handler for ID_DLGEVENTLOG
|
||||
void OnShow( wxShowEvent& event );
|
||||
|
||||
/// wxEVT_SHOW event handler for ID_DLGEVENTLOG
|
||||
void OnRefresh( wxTimerEvent& event );
|
||||
|
||||
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK
|
||||
void OnOK( wxCommandEvent& event );
|
||||
|
||||
|
@ -106,6 +102,9 @@ public:
|
|||
|
||||
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SIMPLE_HELP
|
||||
void OnButtonHelp( wxCommandEvent& event );
|
||||
|
||||
/// wxEVT_TIMER event handler for ID_DLGEVENTLOG
|
||||
void OnRefresh( wxTimerEvent& event );
|
||||
////@end CDlgEventLog event handler declarations
|
||||
|
||||
////@begin CDlgEventLog member function declarations
|
||||
|
|
|
@ -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