From ac1e3d1115e2eee6e4b5b7eef327497e61391a90 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Sun, 20 Dec 2009 01:48:48 +0000
Subject: [PATCH] MGR: Begin fixing new Event Log to integrate properly with
 async RPC logic

svn path=/trunk/boinc/; revision=19995
---
 checkin_notes               |  1 +
 clientgui/AdvancedFrame.cpp |  4 ++++
 clientgui/DlgEventLog.cpp   | 13 +------------
 clientgui/Events.h          |  2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 1cc6b0c3dc..b632f3a2a8 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -10454,6 +10454,7 @@ Charlie  19 Dec 2009
     clientgui/
         AdvancedFrame.cpp, .h
         DlgEventLog.cpp, .h
+        Events.h
      mac_build/
         boinc.xcodeproj/
             project.pbxproj
diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index 75f5302403..c1cbd0cbbf 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -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"));
diff --git a/clientgui/DlgEventLog.cpp b/clientgui/DlgEventLog.cpp
index 5543ff37a3..14e41741b5 100644
--- a/clientgui/DlgEventLog.cpp
+++ b/clientgui/DlgEventLog.cpp
@@ -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) ) {
diff --git a/clientgui/Events.h b/clientgui/Events.h
index 656832d4ef..5357e3e920 100644
--- a/clientgui/Events.h
+++ b/clientgui/Events.h
@@ -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