From d338b9eeca81ccd45e4a5f0b871256d576aa5016 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Thu, 21 Apr 2005 19:10:10 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=5914
---
 clientgui/BOINCTaskCtrl.cpp | 11 +++++++----
 clientgui/MainFrame.cpp     |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/clientgui/BOINCTaskCtrl.cpp b/clientgui/BOINCTaskCtrl.cpp
index 6928cb3dfa..1e5d9c90ba 100644
--- a/clientgui/BOINCTaskCtrl.cpp
+++ b/clientgui/BOINCTaskCtrl.cpp
@@ -33,7 +33,7 @@ CBOINCTaskCtrl::CBOINCTaskCtrl() {}
 
 
 CBOINCTaskCtrl::CBOINCTaskCtrl(CBOINCBaseView* pView, wxWindowID iTaskWindowID, wxInt32 iTaskWindowFlags) :
-    wxPanel(pView, iTaskWindowID, wxDefaultPosition, wxSize(150, -1), iTaskWindowFlags)
+    wxPanel(pView, iTaskWindowID, wxDefaultPosition, wxSize(175, -1), iTaskWindowFlags)
 {
     m_pParent = pView;
     m_pBoxSizer = NULL;
@@ -47,6 +47,8 @@ CBOINCTaskCtrl::~CBOINCTaskCtrl() {}
 wxInt32 CBOINCTaskCtrl::CreateTaskControls() {
     unsigned int        i;
     unsigned int        j;
+    wxInt32             iCurrentWidth = 0;
+    wxInt32             iFutureWidth = 0;
     CTaskItemGroup*     pGroup = NULL;
     CTaskItem*          pItem = NULL;
 
@@ -63,16 +65,17 @@ wxInt32 CBOINCTaskCtrl::CreateTaskControls() {
             pItem = pGroup->m_Tasks[j];
 
             pItem->m_pButton = new wxButton;
-            pItem->m_pButton->Create( this, pItem->m_iEventID, pItem->m_strName, wxDefaultPosition, wxDefaultSize, wxEXPAND );
+            pItem->m_pButton->Create(this, pItem->m_iEventID, pItem->m_strName, wxDefaultPosition, wxDefaultSize, 0);
             pItem->m_pButton->SetToolTip(pItem->m_strDescription);
-            pGroup->m_pStaticBoxSizer->Add(pItem->m_pButton, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
+            pGroup->m_pStaticBoxSizer->Add(pItem->m_pButton, 0, wxEXPAND|wxALL, 5);
         }
 
-        m_pBoxSizer->Add(pGroup->m_pStaticBoxSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);        
+        m_pBoxSizer->Add(pGroup->m_pStaticBoxSizer, 0, wxEXPAND|wxALL, 5);        
         m_pBoxSizer->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);        
     }
 
     SetSizerAndFit(m_pBoxSizer);
+
     return 0;
 }
 
diff --git a/clientgui/MainFrame.cpp b/clientgui/MainFrame.cpp
index 19415975bd..219057d9cb 100644
--- a/clientgui/MainFrame.cpp
+++ b/clientgui/MainFrame.cpp
@@ -655,7 +655,7 @@ bool CMainFrame::RestoreState() {
 
 
     pConfig->Read(wxT("CurrentPage"), &iCurrentPage, 1);
-    //m_pNotebook->SetSelection(iCurrentPage);
+    m_pNotebook->SetSelection(iCurrentPage);
 
 
     pConfig->Read(wxT("WindowIconized"), &bWindowIconized, false);