From 6e388fd0508869b811066d3ec43845f2cb454dba Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Thu, 11 Feb 2010 05:16:24 +0000 Subject: [PATCH] - MGR: Another place that interacts with the taskbar but was included only if compiled for Windows or the Mac. clientgui/ AsyncRPC.cpp MainDocument.cpp svn path=/trunk/boinc/; revision=20534 --- checkin_notes | 9 +++++++++ clientgui/AsyncRPC.cpp | 2 -- clientgui/MainDocument.cpp | 2 -- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/checkin_notes b/checkin_notes index 58fe1dc82c..048b2af183 100644 --- a/checkin_notes +++ b/checkin_notes @@ -1130,3 +1130,12 @@ Rom 10 Feb 2010 clientgui/ BOINCTaskBar.cpp, .h + +Rom 10 Feb 2010 + - MGR: Another place that interacts with the taskbar but was + included only if compiled for Windows or the Mac. + + clientgui/ + AsyncRPC.cpp + MainDocument.cpp + \ No newline at end of file diff --git a/clientgui/AsyncRPC.cpp b/clientgui/AsyncRPC.cpp index 920866d162..9fb64a8cd3 100755 --- a/clientgui/AsyncRPC.cpp +++ b/clientgui/AsyncRPC.cpp @@ -1122,7 +1122,6 @@ void CMainDocument::HandleCompletedRPC() { // We must get the frame immediately before using it, // since it may have been changed by SetActiveGUI(). CBOINCBaseFrame* pFrame = wxGetApp().GetFrame(); - if (pFrame) { CFrameEvent event(wxEVT_FRAME_REFRESHVIEW, pFrame); pFrame->ProcessEvent(event); @@ -1132,7 +1131,6 @@ void CMainDocument::HandleCompletedRPC() { if (m_bNeedTaskBarRefresh && !m_bWaitingForRPC) { m_bNeedTaskBarRefresh = false; CTaskBarIcon* pTaskbar = wxGetApp().GetTaskBarIcon(); - if (pTaskbar) { CTaskbarEvent event(wxEVT_TASKBAR_REFRESH, pTaskbar); pTaskbar->ProcessEvent(event); diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp index 22fb1596e1..83d4b58ab6 100644 --- a/clientgui/MainDocument.cpp +++ b/clientgui/MainDocument.cpp @@ -840,13 +840,11 @@ void CMainDocument::RunPeriodicRPCs(int frameRefreshRate) { if (!IsConnected()) { CFrameEvent event(wxEVT_FRAME_REFRESHVIEW, pFrame); pFrame->AddPendingEvent(event); -#if defined(__WXMSW__) || defined(__WXMAC__) CTaskBarIcon* pTaskbar = wxGetApp().GetTaskBarIcon(); if (pTaskbar) { CTaskbarEvent event(wxEVT_TASKBAR_REFRESH, pTaskbar); pTaskbar->AddPendingEvent(event); } -#endif return; }