diff --git a/checkin_notes b/checkin_notes index bb63793580..57292a1967 100644 --- a/checkin_notes +++ b/checkin_notes @@ -9339,10 +9339,16 @@ Rom 10 Nov 2008 BOINCGUIApp.h DlgOptions.cpp, .h -Rom 31 Oct 2008 +Rom 10 Nov 2008 - Tag for 6.3.22 release, all platforms boinc_core_release_6_3_22 / configure.ac version.h + +Charlie 10 Nov 2008 + - MGR: Fix build break on Mac. + + clientgui/ + DlgExitMessage.cpp diff --git a/clientgui/DlgExitMessage.cpp b/clientgui/DlgExitMessage.cpp index 95a6acfd9b..1e7f6f910f 100644 --- a/clientgui/DlgExitMessage.cpp +++ b/clientgui/DlgExitMessage.cpp @@ -126,20 +126,20 @@ void CDlgExitMessage::CreateControls() wxFlexGridSizer* itemFlexGridSizer4 = new wxFlexGridSizer(3, 1, 0, 0); itemBoxSizer3->Add(itemFlexGridSizer4, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); -#ifndef __WXMAC__ +#ifndef __WXMAC__ strExitMessage.Printf( _("You have requested to exit the %s,\nwhich allows you to view and manage\nthe science applications running on your computer.\n\nIf you also want to stop running the science applications when you\nexit the Manager, then choose from the following options:"), pSkinAdvanced->GetApplicationName().c_str() ); -#else - m_strExitMessage.Printf( - _("This will shut down %s and its tasks entirely until either the\n%s application or the %s screen saver is run again.\n\nIn most cases, it is better just to close the %s window\nrather than to exit the application; that will allow %s to run its\ntasks at the times you selected in your preferences."), - m_strApplicationShortName.c_str(), - m_strApplicationName.c_str(), - m_strApplicationShortName.c_str(), - m_strApplicationName.c_str(), - m_strApplicationShortName.c_str() - ); +#else + strExitMessage.Printf( + _("This will shut down %s and its tasks entirely until either the\n%s application or the %s screen saver is run again.\n\nIn most cases, it is better just to close the %s window\nrather than to exit the application; that will allow %s to run its\ntasks at the times you selected in your preferences."), + pSkinAdvanced->GetApplicationShortName().c_str(), + pSkinAdvanced->GetApplicationName().c_str(), + pSkinAdvanced->GetApplicationShortName().c_str(), + pSkinAdvanced->GetApplicationName().c_str(), + pSkinAdvanced->GetApplicationShortName().c_str() + ); #endif m_DialogExitMessage = new wxStaticText;