From 4e56e102bb9c69b14f08ae917047d88b26805f7a Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Fri, 9 Jun 2006 12:40:27 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=10282 --- api/boinc_api.h | 2 +- checkin_notes | 8 +++++++- clientgui/hyperlink.cpp | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/api/boinc_api.h b/api/boinc_api.h index b59308127c..20e706274b 100755 --- a/api/boinc_api.h +++ b/api/boinc_api.h @@ -67,7 +67,7 @@ struct APP_INIT_DATA; extern int boinc_init(void); extern int boinc_finish(int status); extern int boinc_resolve_filename(const char*, char*, int len); -extern int boinc_get_init_data_p(APP_INIT_DATA*); +extern int boinc_get_init_data_p(struct APP_INIT_DATA*); extern int boinc_parse_init_data_file(void); extern int boinc_write_init_data_file(void); extern int boinc_send_trickle_up(char* variety, char* text); diff --git a/checkin_notes b/checkin_notes index 49ae9c869e..bbb76858e7 100755 --- a/checkin_notes +++ b/checkin_notes @@ -5641,7 +5641,13 @@ Charlie 9 June 2006 - Mac: Reorganize SetUpSecurity for better efficiency. When run standalone (from XCode), SetUpSecurity adds logged in user to group boinc_project in adition to group boinc_master. + - Fix opening URLs in default browser with wxMac-2.6.3. + - Fix compile error in macglutfix.m due to boinc_api.h declaration of + boinc_get_init_data_p(). clientgui/ mac/ SetupSecurity.cpp - + api/ + boinc_api.h + clientgui/ + hyperlink.cpp diff --git a/clientgui/hyperlink.cpp b/clientgui/hyperlink.cpp index 3178745948..d59f420764 100644 --- a/clientgui/hyperlink.cpp +++ b/clientgui/hyperlink.cpp @@ -183,8 +183,10 @@ void wxHyperLink::ExecuteLink (const wxString &strLink) { if (ft) { if (ft->GetOpenCommand(&cmd, wxFileType::MessageParameters(strLink))) { #ifdef __WXMAC__ +#if wxABI_VERSION < 20603 // These are needed for wxMac-2.6.2 but don't work with wxMac-2.6.3 cmd.Replace(wxT(" <"), "\'"); - cmd.Prepend(wxT("open \'")); + cmd.Prepend(wxT("open \'")); +#endif #else cmd.Replace(wxT("file://"), wxEmptyString); #endif