From 1e231050e923ed95e011caebae9764d78b58a1e1 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Fri, 22 Sep 2006 03:19:11 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=11180 --- checkin_notes | 3 +++ clientgui/BOINCDialupManager.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 11c51c0875..15724abae9 100755 --- a/checkin_notes +++ b/checkin_notes @@ -10369,6 +10369,7 @@ Walt 20 Sept 2006 ViewWork.cpp Charlie 21 Sept 2006 + - Mac: fix compiler warning. - Mac: Set PROCINFO user_time to cpu time from ps command; use rsz instead of rss for working_set_size; set page_fault_count to pagein value from ps command. Unfortunately, none of these @@ -10379,6 +10380,8 @@ Charlie 21 Sept 2006 Mac_SA_Insecure.sh. - Mac: improvements to Mac_SA_Secure.sh, Mac_SA_Insecure.sh scripts. + clientgui/ + BOINCDialupManager.cpp lib/ procinfo_mac.C mac_installer/ diff --git a/clientgui/BOINCDialupManager.cpp b/clientgui/BOINCDialupManager.cpp index e4e4cee287..cd000ce164 100644 --- a/clientgui/BOINCDialupManager.cpp +++ b/clientgui/BOINCDialupManager.cpp @@ -88,7 +88,7 @@ size_t CBOINCDialUpManager::GetISPNames(wxArrayString& names) { void CBOINCDialUpManager::poll() { CMainDocument* pDoc = wxGetApp().GetDocument(); CBOINCBaseFrame* pFrame = wxGetApp().GetFrame(); -#if defined(__WXMSW__) || defined(__WXMAC__) +#if defined(__WXMSW__) CTaskBarIcon* pTaskbar = wxGetApp().GetTaskBarIcon(); #endif wxTimeSpan tsLastDialupAlertSent; @@ -103,7 +103,7 @@ void CBOINCDialUpManager::poll() { if (pDoc) { wxASSERT(wxDynamicCast(pDoc, CMainDocument)); wxASSERT(wxDynamicCast(pFrame, CBOINCBaseFrame)); -#if defined(__WXMSW__) || defined(__WXMAC__) +#if defined(__WXMSW__) wxASSERT(wxDynamicCast(pTaskbar, CTaskBarIcon)); #endif