*** empty log message ***

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

checkin_notes

@@ -1813,3 +1813,17 @@ David  14 Feb 2006
 
     client
         cs_statefile.C
+
+Rom    14 Feb 2006
+    - Bug Fix: After any of the wizards have been executed, recreate the
+        menus.
+    - Bug Fix: Call Fit() before setting focus to any of the controls.
+        Fit() messes up the input focus even though the control still
+        seems like it is selected and has focus.
+        
+    clientgui/
+        AccountInfoPage.cpp
+        AccountKeyPage.cpp
+        MainFrame.cpp
+        ProjectInfoPage.cpp
+        ProxyPage.cpp

clientgui/AccountInfoPage.cpp

@@ -400,8 +400,8 @@ void CAccountInfoPage::OnPageChanged( wxWizardExEvent& event ) {
         m_pAccountPasswordRequirmentsStaticCtrl->SetLabel( str );
     }
  
-    m_pAccountEmailAddressCtrl->SetFocus();
     Fit();
+    m_pAccountEmailAddressCtrl->SetFocus();
 }
   
 /*!

clientgui/AccountKeyPage.cpp

@@ -232,8 +232,8 @@ void CAccountKeyPage::OnPageChanged( wxWizardExEvent& event ) {
         _("Account key:")
     );
 
-    m_pAccountKeyCtrl->SetFocus();
     Fit();
+    m_pAccountKeyCtrl->SetFocus();
 }
   
 /*!

clientgui/MainFrame.cpp

@@ -1106,6 +1106,8 @@ void CMainFrame::OnProjectsAttachToAccountManager(wxCommandEvent& WXUNUSED(event
         if (pWizard)
             pWizard->Destroy();
 
+        DeleteMenu();
+        CreateMenu();
         FireRefreshView();
 
         m_pRefreshStateTimer->Start();
@@ -1146,6 +1148,8 @@ void CMainFrame::OnAccountManagerUpdate(wxCommandEvent& WXUNUSED(event)) {
         if (pWizard)
             pWizard->Destroy();
 
+        DeleteMenu();
+        CreateMenu();
         FireRefreshView();
 
         m_pRefreshStateTimer->Start();
@@ -1186,6 +1190,8 @@ void CMainFrame::OnAccountManagerDetach(wxCommandEvent& WXUNUSED(event)) {
         if (pWizard)
             pWizard->Destroy();
 
+        DeleteMenu();
+        CreateMenu();
         FireRefreshView();
 
         m_pRefreshStateTimer->Start();
@@ -1230,6 +1236,9 @@ void CMainFrame::OnProjectsAttachToProject( wxCommandEvent& WXUNUSED(event) ) {
         if (pWizard)
             pWizard->Destroy();
 
+        DeleteMenu();
+        CreateMenu();
+
         m_pRefreshStateTimer->Start();
         m_pFrameRenderTimer->Start();
         m_pFrameListPanelRenderTimer->Start();

clientgui/ProjectInfoPage.cpp

@@ -238,9 +238,8 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
         wxT("http://boinc.berkeley.edu/")
     );
 
-    m_pProjectUrlCtrl->SetFocus();
-
     Fit();
+    m_pProjectUrlCtrl->SetFocus();
 }
   
 /*!

clientgui/ProxyPage.cpp

@@ -323,7 +323,6 @@ void CErrProxyPage::OnPageChanged( wxWizardExEvent& event ) {
     wxASSERT(m_pProxySOCKSPasswordStaticCtrl);
     wxASSERT(m_pProxySOCKSPasswordCtrl);
 
-    if (event.GetDirection() == true) {
     // Moving from the previous page, update text and get state
 
     m_pTitleStaticCtrl->SetLabel(
@@ -380,10 +379,8 @@ void CErrProxyPage::OnPageChanged( wxWizardExEvent& event ) {
     strBuffer.Printf(wxT("%d"), pDoc->proxy_info.socks_server_port);
     m_pProxySOCKSPortCtrl->SetValue(strBuffer);
 
-        m_pProxyHTTPServerCtrl->SetFocus();
-    }
-
     Fit();
+    m_pProxyHTTPServerCtrl->SetFocus();
 }
  
 /*!