From 4c1a15911883b4df0f31474c85590a86c7b86331 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Wed, 24 Aug 2005 07:10:23 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=7470
---
 checkin_notes                  |  2 ++
 clientgui/WizAttachProject.cpp | 35 +++++-----------------------------
 2 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 5d3c9e8f07..26302ea07d 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -10923,6 +10923,8 @@ Rom    23 Aug 2005
 
 Rom    23 Aug 2005
     - Fix LF problem with Wizard files
+    - Remove finish page on error
+    - Enable next and back buttons on a cancel event
 
     clientgui/
         BOINCGUI.pjd
diff --git a/clientgui/WizAttachProject.cpp b/clientgui/WizAttachProject.cpp
index 8e330e4e70..17b8430700 100644
--- a/clientgui/WizAttachProject.cpp
+++ b/clientgui/WizAttachProject.cpp
@@ -334,11 +334,6 @@ bool CWizAttachProject::HasNextPage( wxWizardPage* page )
 
     bNoNextPageDetected |= (page == m_CompletionPage);
     bNoNextPageDetected |= (page == m_CompletionErrorPage);
-    bNoNextPageDetected |= (page == m_ErrProjectNotDetectedPage);
-    bNoNextPageDetected |= (page == m_ErrProjectUnavailablePage);
-    bNoNextPageDetected |= (page == m_ErrNoInternetConnectionPage);
-    bNoNextPageDetected |= (page == m_ErrAccountAlreadyExistsPage);
-    bNoNextPageDetected |= (page == m_ErrAccountCreationDisabledPage);
  
     if (bNoNextPageDetected)
         return false;
@@ -482,7 +477,11 @@ void CWizAttachProject::ProcessCancelEvent( wxWizardEvent& event ) {
         wxICON_QUESTION | wxYES_NO,
         this
     );
- 
+
+    // Reenable the next and back buttons if they have been disabled
+    GetNextButton()->Enable();
+    GetBackButton()->Enable();
+
     // Page specific rules - Disable the validator(s)
     if (wxYES == iRetVal) {
         if (GetCurrentPage() == m_ProjectInfoPage) {
@@ -2841,10 +2840,6 @@ wxWizardPage* CErrProjectNotDetectedPage::GetPrev() const
  
 wxWizardPage* CErrProjectNotDetectedPage::GetNext() const
 {
-    if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
-        // Cancel Event Detected
-        return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
-    }
     return NULL;
 }
  
@@ -2997,10 +2992,6 @@ wxWizardPage* CErrProjectUnavailablePage::GetPrev() const
  
 wxWizardPage* CErrProjectUnavailablePage::GetNext() const
 {
-    if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
-        // Cancel Event Detected
-        return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
-    }
     return NULL;
 }
  
@@ -3148,10 +3139,6 @@ wxWizardPage* CErrNoInternetConnectionPage::GetPrev() const
 
 wxWizardPage* CErrNoInternetConnectionPage::GetNext() const
 {
-    if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
-        // Cancel Event Detected
-        return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
-    }
     return NULL;
 }
 
@@ -3298,10 +3285,6 @@ wxWizardPage* CErrAccountNotFoundPage::GetPrev() const
 
 wxWizardPage* CErrAccountNotFoundPage::GetNext() const
 {
-    if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
-        // Cancel Event Detected
-        return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
-    }
     return NULL;
 }
  
@@ -3448,10 +3431,6 @@ wxWizardPage* CErrAccountAlreadyExistsPage::GetPrev() const
  
 wxWizardPage* CErrAccountAlreadyExistsPage::GetNext() const
 {
-    if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
-        // Cancel Event Detected
-        return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
-    }
     return NULL;
 }
  
@@ -3599,10 +3578,6 @@ wxWizardPage* CErrAccountCreationDisabledPage::GetPrev() const
  
 wxWizardPage* CErrAccountCreationDisabledPage::GetNext() const
 {
-    if (((CWizAttachProject*)GetParent())->IsCancelInProgress()) {
-        // Cancel Event Detected
-        return PAGE_TRANSITION_NEXT(ID_COMPLETIONERRORPAGE);
-    }
     return NULL;
 }