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

MGR: Remove validator resets when cancel is pressed, apparently it is no longer needed.

This commit is contained in:
Rom Walton 2014-04-08 17:03:29 -04:00
parent 3bceafe8af
commit 65ea84546e
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clientgui/WizardAttach.cpp
View File

@ -643,28 +643,6 @@ void CWizardAttach::_ProcessCancelEvent( wxWizardExEvent& event ) {
GetNextButton()->Enable(); GetNextButton()->Enable();
GetBackButton()->Enable(); GetBackButton()->Enable();
// Page specific rules - Disable the validator(s)
if (wxYES == iRetVal) {
if ((page == m_ProjectInfoPage) || (page == m_AccountManagerInfoPage)) {
m_ProjectInfoPage->m_pProjectURLCtrl->SetValidator(wxDefaultValidator);
} else if (page == m_AccountInfoPage) {
m_AccountInfoPage->m_pAccountEmailAddressCtrl->SetValidator(wxDefaultValidator);
m_AccountInfoPage->m_pAccountPasswordCtrl->SetValidator(wxDefaultValidator);
if (IsAttachToProjectWizard) {
m_AccountInfoPage->m_pAccountConfirmPasswordCtrl->SetValidator(wxDefaultValidator);
}
} else if (page == m_ErrProxyPage) {
m_ErrProxyPage->m_pProxyHTTPServerCtrl->SetValidator(wxDefaultValidator);
m_ErrProxyPage->m_pProxyHTTPPortCtrl->SetValidator(wxDefaultValidator);
m_ErrProxyPage->m_pProxyHTTPUsernameCtrl->SetValidator(wxDefaultValidator);
m_ErrProxyPage->m_pProxyHTTPPasswordCtrl->SetValidator(wxDefaultValidator);
m_ErrProxyPage->m_pProxySOCKSServerCtrl->SetValidator(wxDefaultValidator);
m_ErrProxyPage->m_pProxySOCKSPortCtrl->SetValidator(wxDefaultValidator);
m_ErrProxyPage->m_pProxySOCKSUsernameCtrl->SetValidator(wxDefaultValidator);
m_ErrProxyPage->m_pProxySOCKSPasswordCtrl->SetValidator(wxDefaultValidator);
}
}
// Generic rules // Generic rules
bCancelWithoutNextPage |= (page == m_ErrNotDetectedPage); bCancelWithoutNextPage |= (page == m_ErrNotDetectedPage);
bCancelWithoutNextPage |= (page == m_ErrUnavailablePage); bCancelWithoutNextPage |= (page == m_ErrUnavailablePage);
@ -675,6 +653,7 @@ void CWizardAttach::_ProcessCancelEvent( wxWizardExEvent& event ) {
} else { } else {
bCancelWithoutNextPage |= (page == m_WelcomePage); bCancelWithoutNextPage |= (page == m_WelcomePage);
} }
if (wxYES != iRetVal) { if (wxYES != iRetVal) {
event.Veto(); event.Veto();
m_bCancelInProgress = false; m_bCancelInProgress = false;