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

MGR: Re-enable cancel confirmation dialog in the wizard.

This commit is contained in:
Rom Walton 2014-04-08 16:37:39 -04:00
parent df8063fe6b
commit 3bceafe8af
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clientgui/WizardAttach.cpp
View File

@ -625,12 +625,13 @@ wxWizardPageEx* CWizardAttach::_PushPageTransition( wxWizardPageEx* pCurrentPage
return NULL; return NULL;
} }
#if 0
void CWizardAttach::_ProcessCancelEvent( wxWizardExEvent& event ) { void CWizardAttach::_ProcessCancelEvent( wxWizardExEvent& event ) {
bool bCancelWithoutNextPage = false; bool bCancelWithoutNextPage = false;
wxWizardPageEx* page = GetCurrentPage(); wxWizardPageEx* page = GetCurrentPage();
m_bCancelInProgress = true;
int iRetVal = wxGetApp().SafeMessageBox( int iRetVal = wxGetApp().SafeMessageBox(
_("Do you really want to cancel?"), _("Do you really want to cancel?"),
_("Question"), _("Question"),
@ -676,9 +677,11 @@ void CWizardAttach::_ProcessCancelEvent( wxWizardExEvent& event ) {
} }
if (wxYES != iRetVal) { if (wxYES != iRetVal) {
event.Veto(); event.Veto();
m_bCancelInProgress = false;
} else {
m_bCancelInProgress = true;
} }
} }
#endif
/*! /*!
* wxEVT_WIZARD_FINISHED event handler for ID_ATTACHPROJECTWIZARD * wxEVT_WIZARD_FINISHED event handler for ID_ATTACHPROJECTWIZARD

2
clientgui/WizardAttach.h
View File

@ -245,7 +245,7 @@ public:
wxWizardPageEx* _PushPageTransition( wxWizardPageEx* pCurrentPage, unsigned long ulPageID ); wxWizardPageEx* _PushPageTransition( wxWizardPageEx* pCurrentPage, unsigned long ulPageID );
/// Cancel Event Infrastructure /// Cancel Event Infrastructure
// void _ProcessCancelEvent( wxWizardExEvent& event ); void _ProcessCancelEvent( wxWizardExEvent& event );
/// Finish Button Environment /// Finish Button Environment
bool GetAccountCreatedSuccessfully() const { return account_created_successfully ; } bool GetAccountCreatedSuccessfully() const { return account_created_successfully ; }