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
This commit is contained in:
Charlie Fenton 2008-11-07 10:03:41 +00:00
parent ae826ef2eb
commit c9358f3401
2 changed files with 21 additions and 0 deletions

View File

@ -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

View File

@ -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;
}