*** empty log message ***

svn path=/trunk/boinc/; revision=7270

checkin_notes

@@ -10372,3 +10372,12 @@ David  11 Aug 2005
 
     api/
         boinc_api.C
+
+Rom    11 Aug 2005
+    - Fix the remaining cancel bugs.
+      If cancel is selected from the welcome page make the wizard disappear.
+      If cencel is selected on any other page, advance to the completion error
+        page.
+    
+    clientgui/
+        WizAttachProject.cpp

clientgui/WizAttachProject.cpp

@@ -325,7 +325,7 @@ bool CWizAttachProject::HasNextPage( wxWizardPage* page )
 
 bool CWizAttachProject::HasPrevPage( wxWizardPage* page )
 {
-    if (page == m_WelcomePage)
+    if ((page == m_WelcomePage) || (page == m_CompletionErrorPage))
         return false;
     return true;
 }
@@ -447,12 +447,17 @@ void CWizAttachProject::ProcessCancelEvent( wxWizardEvent& event ) {
         wxICON_QUESTION | wxYES_NO,
         this
     );
-    
-    if (iRetVal != wxYES) {
+ 
+    if (GetCurrentPage() != m_WelcomePage) {
         event.Veto();
+        if (wxYES == iRetVal) {
+            m_bCancelInProgress = true;
+            SimulateNextButton();
+        }
     } else {
-        m_bCancelInProgress = true;
-        SimulateNextButton();
+        if (wxYES != iRetVal) {
+            event.Veto();
+        }
     }
 }