From c9358f340103bb43335d3d35f969d49a657089e6 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Fri, 7 Nov 2008 10:03:41 +0000 Subject: [PATCH] MGR: On Mac, restore using original exit dialog text from skin file or use old default if none in skin file svn path=/trunk/boinc/; revision=16446 --- checkin_notes | 7 +++++++ clientgui/SkinManager.cpp | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/checkin_notes b/checkin_notes index 1932c63a12..2042ade199 100644 --- a/checkin_notes +++ b/checkin_notes @@ -9297,3 +9297,10 @@ David 6 Nov handle_request.cpp zip/ boinc_zip.cpp + +Charlie 7 Nov 2008 + - MGR: On Mac, restore using original exit dialog text from skin file + or use old default if none in skin file. + + clientgui/ + SkinManager.cpp diff --git a/clientgui/SkinManager.cpp b/clientgui/SkinManager.cpp index ec6cca3bcf..35b1be3ca0 100644 --- a/clientgui/SkinManager.cpp +++ b/clientgui/SkinManager.cpp @@ -1042,7 +1042,21 @@ bool CSkinAdvanced::InitializeDelayedValidation() { if (!disable_error_msgs) { fprintf(stderr, "Skin Manager: Exit message was not defined. Using default.\n"); } +#ifdef __WXMAC__ + // NOTE: Must be called after filling in m_strProjectName and m_strApplicationName + 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() + ); + + wxASSERT(!m_strExitMessage.IsEmpty()); +#else m_strExitMessage = wxEmptyString; +#endif } return true; }