Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Mac: Fix bugs when user chooses Quit from menubar icon menu and then cancels in confirmation dialog. 

svn path=/trunk/boinc/; revision=13001
This commit is contained in:
Charlie Fenton 2007-06-24 09:24:52 +00:00
parent b77756c7c0
commit dbfb00570e
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
checkin_notes
View File

@ -6622,3 +6622,12 @@ Charlie 23 June 2007
cs_statefile.C
lib/
filesys.C
Charlie 24 June 2007
Mac: Fix bugs when user chooses Quit from menubar icon menu and
then cancels in confirmation dialog.
clientgui/
BOINCTaskBar.cpp
mac/
MacSysMenu.cpp

5
clientgui/BOINCTaskBar.cpp
View File

@ -277,7 +277,10 @@ void CTaskBarIcon::OnAbout(wxCommandEvent& WXUNUSED(event)) {
void CTaskBarIcon::OnExit(wxCommandEvent& event) {
wxLogTrace(wxT("Function Start/End"), wxT("CTaskBarIcon::OnExit - Function Begin"));
if (wxGetApp().ConfirmExit()) {
#ifndef __WXMAC__
if (wxGetApp().ConfirmExit())
#endif
{
wxCloseEvent eventClose;
OnClose(eventClose);
if (eventClose.GetSkipped()) event.Skip();

7
clientgui/mac/MacSysMenu.cpp
View File

@ -314,7 +314,12 @@ pascal OSStatus SysMenuEventHandler( EventHandlerCallRef inHandlerCallRef,
commandID = wxID_PREFERENCES;
break;
case kHICommandQuit:
commandID = wxID_EXIT;
if (wxGetApp().ConfirmExit()) {
commandID = wxID_EXIT;
} else {
commandID = 0;
return noErr;
}
break;
}