diff --git a/checkin_notes b/checkin_notes index 9c2a3b4080..e70ba8a44d 100644 --- a/checkin_notes +++ b/checkin_notes @@ -10415,3 +10415,15 @@ David 18 Dec 2009 html/inc/ text_transform.inc + +Charlie 19 Dec 2009 + - MGR: Fix Mac compile errors caused by adding Windows-only code to + cross-platform source files. Also fix compiler warnings. + - Mac: Remove deleted files hyperlink.cpp,.h from XCode project. + + clientgui/ + BOINCTaskBar.cpp + sg_StatImageLoader.cpp + mac_build/ + boinc.xcodeproj/ + project.pbxproj diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp index 963db7e37c..1808ff9827 100644 --- a/clientgui/BOINCTaskBar.cpp +++ b/clientgui/BOINCTaskBar.cpp @@ -51,7 +51,9 @@ BEGIN_EVENT_TABLE(CTaskBarIcon, wxTaskBarIconEx) EVT_TASKBAR_REFRESH(CTaskBarIcon::OnRefresh) EVT_TASKBAR_RELOADSKIN(CTaskBarIcon::OnReloadSkin) EVT_TASKBAR_LEFT_DCLICK(CTaskBarIcon::OnLButtonDClick) - EVT_TASKBAR_CONTEXT_USERCLICK(CTaskBarIcon::OnNotificationClick) +#ifdef __WXMSW__ + EVT_TASKBAR_CONTEXTUSERCLICK(CTaskBarIcon::OnNotificationClick) +#endif EVT_MENU(wxID_OPEN, CTaskBarIcon::OnOpen) EVT_MENU(ID_OPENWEBSITE, CTaskBarIcon::OnOpenWebsite) EVT_MENU(ID_TB_SUSPEND, CTaskBarIcon::OnSuspendResume) @@ -189,14 +191,11 @@ void CTaskBarIcon::OnOpenWebsite(wxCommandEvent& WXUNUSED(event)) { wxLogTrace(wxT("Function Start/End"), wxT("CTaskBarIcon::OnOpenWebsite - Function Begin")); CMainDocument* pDoc = wxGetApp().GetDocument(); - CBOINCBaseFrame* pFrame = wxGetApp().GetFrame(); ACCT_MGR_INFO ami; wxString url; wxASSERT(pDoc); wxASSERT(wxDynamicCast(pDoc, CMainDocument)); - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CBOINCBaseFrame)); ResetTaskBar(); @@ -245,6 +244,7 @@ void CTaskBarIcon::OnSuspendResumeGPU(wxCommandEvent& WXUNUSED(event)) { void CTaskBarIcon::OnTestNotification(wxCommandEvent& WXUNUSED(event)) { wxLogTrace(wxT("Function Start/End"), wxT("CTaskBarIcon::OnTestNotification - Function Begin")); +#ifdef __WXMSW__ QueueBalloon( m_iconTaskBarNormal, _("BOINC Notification"), @@ -252,6 +252,7 @@ void CTaskBarIcon::OnTestNotification(wxCommandEvent& WXUNUSED(event)) { NIIF_INFO ); +#endif wxLogTrace(wxT("Function Start/End"), wxT("CTaskBarIcon::OnTestNotification - Function End")); } diff --git a/clientgui/sg_StatImageLoader.cpp b/clientgui/sg_StatImageLoader.cpp index 7fbc1d3bd8..404877b100 100644 --- a/clientgui/sg_StatImageLoader.cpp +++ b/clientgui/sg_StatImageLoader.cpp @@ -171,18 +171,12 @@ void StatImageLoader::OnMenuLinkClicked(wxCommandEvent& event) //call detach project function OnProjectDetach(); } else if (menuIDevt == WEBSITE_URL_MENU_ID_HOMEPAGE ) { - CBOINCBaseFrame* pFrame = wxDynamicCast(m_parent->GetParent(),CBOINCBaseFrame); - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CBOINCBaseFrame)); wxLaunchDefaultBrowser(wxString(m_prjUrl.c_str(),wxConvUTF8)); } else{ int menuId = menuIDevt - WEBSITE_URL_MENU_ID; PROJECT* project = pDoc->state.lookup_project(m_prjUrl); project->gui_urls[menuId].name.c_str(); - CBOINCBaseFrame* pFrame = wxDynamicCast(m_parent->GetParent(),CBOINCBaseFrame); - wxASSERT(pFrame); - wxASSERT(wxDynamicCast(pFrame, CBOINCBaseFrame)); wxLaunchDefaultBrowser(wxString(project->gui_urls[menuId].url.c_str(),wxConvUTF8)); } } diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 580554795a..cd38dc9964 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -90,7 +90,6 @@ DD3E14F50A774397007E0084 /* gui_rpc_client_ops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD73E34E08A0694000656EB1 /* gui_rpc_client_ops.cpp */; }; DD3E14F60A774397007E0084 /* gui_rpc_client_print.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD73E34F08A0694100656EB1 /* gui_rpc_client_print.cpp */; }; DD3E14F70A774397007E0084 /* hostinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD344BB607C5AEEE0043025C /* hostinfo.cpp */; }; - DD3E14F80A774397007E0084 /* hyperlink.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD5EEB6A0873DD4400963F44 /* hyperlink.cpp */; }; DD3E14F90A774397007E0084 /* Localization.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD73E3A308A078AF00656EB1 /* Localization.cpp */; }; DD3E14FA0A774397007E0084 /* LogBOINC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD81C41407C5D13E0098A04D /* LogBOINC.cpp */; }; DD3E14FB0A774397007E0084 /* MacSysMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD2F32F707F2A88B00645DDC /* MacSysMenu.cpp */; }; @@ -206,8 +205,8 @@ DD7BF7E60B8E7B6C00A009F7 /* str_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD7BF7D70B8E7A9800A009F7 /* str_util.cpp */; }; DD7BF7E80B8E7BBE00A009F7 /* work_fetch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD7BF7E70B8E7BBE00A009F7 /* work_fetch.cpp */; }; DD7DD79B0B8BFA4000B11279 /* ViewResources.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD81C42307C5D1D70098A04D /* ViewResources.cpp */; }; - DD7DD7C90B8BFD4800B11279 /* ViewMessages.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD81C42507C5D1D70098A04D /* ViewMessages.cpp */; }; DD85AE4B0F5D284D0031F7AC /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD1929D80918A2F100C31BCF /* Security.framework */; }; + DD867B7510DCE77700128AB4 /* notice.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDE1372D10DC5E8D00161D6B /* notice.cpp */; }; DD89163D0F3B182700DE5B1C /* ss_app.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD89163C0F3B182700DE5B1C /* ss_app.cpp */; }; DD89165A0F3B1B9000DE5B1C /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDFE854A0B60CFD0009B43D9 /* AppKit.framework */; }; DD89165F0F3B1BC200DE5B1C /* GLUT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD89165D0F3B1BC200DE5B1C /* GLUT.framework */; }; @@ -774,8 +773,6 @@ DD58C46A08F334EA00C1DF66 /* wizardex.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = wizardex.h; path = ../clientgui/wizardex.h; sourceTree = SOURCE_ROOT; }; DD5D7EBA0FE320F600ACF87B /* Uninstaller.r */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.rez; name = Uninstaller.r; path = ../mac_installer/Uninstaller.r; sourceTree = SOURCE_ROOT; }; DD5DDADC0CD2AF200075461A /* wxWindows.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = wxWindows.xcodeproj; path = "../../wxMac-2.8.10/src/wxWindows.xcodeproj"; sourceTree = SOURCE_ROOT; }; - DD5EEB6A0873DD4400963F44 /* hyperlink.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = hyperlink.cpp; sourceTree = ""; }; - DD5EEB6B0873DD4400963F44 /* hyperlink.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = hyperlink.h; sourceTree = ""; }; DD5EF07007C5B329007CCE8D /* whetstone.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = whetstone.cpp; sourceTree = ""; }; DD5EF08807C5B7C7007CCE8D /* version.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = version.h; path = ../version.h; sourceTree = SOURCE_ROOT; }; DD635A410D384FA500BAC1A5 /* texfont.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = texfont.cpp; sourceTree = ""; }; @@ -1359,8 +1356,6 @@ DD2D25CB07FAB41700151141 /* DlgSelectComputer.cpp */, DD2D25CC07FAB41700151141 /* DlgSelectComputer.h */, DD81C44D07C5D2470098A04D /* Events.h */, - DD5EEB6A0873DD4400963F44 /* hyperlink.cpp */, - DD5EEB6B0873DD4400963F44 /* hyperlink.h */, DD81C41407C5D13E0098A04D /* LogBOINC.cpp */, DD73E3A308A078AF00656EB1 /* Localization.cpp */, DD73E3A408A078AF00656EB1 /* Localization.h */, @@ -2478,7 +2473,6 @@ DD3E14F50A774397007E0084 /* gui_rpc_client_ops.cpp in Sources */, DD3E14F60A774397007E0084 /* gui_rpc_client_print.cpp in Sources */, DD3E14F70A774397007E0084 /* hostinfo.cpp in Sources */, - DD3E14F80A774397007E0084 /* hyperlink.cpp in Sources */, DD3E14F90A774397007E0084 /* Localization.cpp in Sources */, DD3E14FA0A774397007E0084 /* LogBOINC.cpp in Sources */, DD3E14FB0A774397007E0084 /* MacSysMenu.cpp in Sources */, @@ -2534,7 +2528,6 @@ DDFE84E50B60CD66009B43D9 /* DlgAdvPreferences.cpp in Sources */, DDFE84E70B60CD66009B43D9 /* DlgAdvPreferencesBase.cpp in Sources */, DD7DD79B0B8BFA4000B11279 /* ViewResources.cpp in Sources */, - DD7DD7C90B8BFD4800B11279 /* ViewMessages.cpp in Sources */, DD7BF7E60B8E7B6C00A009F7 /* str_util.cpp in Sources */, DD205A1A0BAF596E0008D473 /* ProjectListCtrl.cpp in Sources */, DD4E704C0BCDAC360010A522 /* browser.cpp in Sources */, @@ -2561,6 +2554,7 @@ DDE1373D10DC60BB00161D6B /* ViewNotifications.cpp in Sources */, DDE1374210DC60E200161D6B /* DlgEventLog.cpp in Sources */, DDE1374910DC613600161D6B /* DlgEventLogListCtrl.cpp in Sources */, + DD867B7510DCE77700128AB4 /* notice.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };