From eba8eb373e0adb49b372c1e563415a350de7abfa Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Tue, 15 Nov 2011 00:48:49 +0000
Subject: [PATCH] Mgr: In CSimpleTaskPanel, change Update() to UpdatePanel() to
 fix compiler warning

svn path=/trunk/boinc/; revision=24596
---
 checkin_notes                     | 8 ++++++++
 clientgui/sg_BoincSimpleFrame.cpp | 4 ++--
 clientgui/sg_TaskPanel.cpp        | 4 ++--
 clientgui/sg_TaskPanel.h          | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 2a2017d3c3..299e90309a 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -8471,3 +8471,11 @@ David  14 Nov 2011
         sched_types.cpp
     lib/
         parse.cpp,h
+
+Charlie 14 Nov 2011
+    - Mgr: In CSimpleTaskPanel, change name of Update() to UpdatePanel() 
+        to fix compiler warning about overloading wxWindow::Update().
+    
+    clientgui/
+        sg_BoincSimpleFrame.cpp
+        sg_TaskPanel.cpp,.h
diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp
index d5e45990d0..1bce1d0fba 100755
--- a/clientgui/sg_BoincSimpleFrame.cpp
+++ b/clientgui/sg_BoincSimpleFrame.cpp
@@ -858,7 +858,7 @@ void CSimpleGUIPanel::OnFrameRender() {
     // Workaround for Linux refresh problem
     if (m_irefreshCount < REFRESH_WAIT) {
         ++m_irefreshCount;
-        m_taskPanel->Update(true);
+        m_taskPanel->UpdatePanel(true);
 	return;
     }
 	
@@ -908,7 +908,7 @@ void CSimpleGUIPanel::OnFrameRender() {
         
         m_oldWorkCount = workCount;
         
-	m_taskPanel->Update(false);
+	m_taskPanel->UpdatePanel(false);
 
     }
 }
diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp
index 185ba3ab79..034554915f 100755
--- a/clientgui/sg_TaskPanel.cpp
+++ b/clientgui/sg_TaskPanel.cpp
@@ -364,12 +364,12 @@ void CSimpleTaskPanel::OnTaskSelection(wxCommandEvent& /*event*/)
     if (sel != m_CurrentTaskSelection) {
         m_CurrentTaskSelection = sel;
         m_bStableTaskInfoChanged = true;
-        Update();
+        UpdatePanel();
     }
 }
 
 
-void CSimpleTaskPanel::Update(bool delayShow) {
+void CSimpleTaskPanel::UpdatePanel(bool delayShow) {
     wxString s = wxEmptyString;
     wxString projName = wxEmptyString;
     TaskSelectionData *selData;
diff --git a/clientgui/sg_TaskPanel.h b/clientgui/sg_TaskPanel.h
index 56e385d27a..8f0ea8de68 100755
--- a/clientgui/sg_TaskPanel.h
+++ b/clientgui/sg_TaskPanel.h
@@ -86,7 +86,7 @@ class CSimpleTaskPanel : public CSimplePanelBase
 
         TaskSelectionData* GetTaskSelectionData();
         wxString GetSelectedTaskString() { return m_TaskSelectionCtrl->GetValue(); }
-        void Update(bool delayShow=false);
+        void UpdatePanel(bool delayShow=false);
         wxRect GetProgressRect() { return m_ProgressRect; }
         void ReskinInterface();