From ce22da50bc3020a852610345e12bb1e60efad84d Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Sun, 24 Jul 2005 08:35:57 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=6788 --- checkin_notes | 11 +++++++++++ clientgui/BOINCBaseView.cpp | 7 +++++-- clientgui/BOINCTaskCtrl.cpp | 4 ++-- clientgui/ViewMessages.cpp | 1 + clientgui/ViewProjects.cpp | 4 ++-- clientgui/ViewResources.cpp | 1 + clientgui/ViewStatistics.cpp | 1 + clientgui/ViewTransfers.cpp | 2 ++ 8 files changed, 25 insertions(+), 6 deletions(-) diff --git a/checkin_notes b/checkin_notes index 5806b28bcc..73cd874232 100755 --- a/checkin_notes +++ b/checkin_notes @@ -9511,3 +9511,14 @@ Janus 23 July 2005 /api/ boinc_api.C +Rom 24 July 2005 + - Fix the control positioning on platforms other than Windows. + + clientgui/ + BOINCBaseView.cpp + BOINCTaskCtrl.cpp + ViewMessages.cpp + ViewProjects.cpp + ViewResources.cpp + ViewStatistics.cpp + ViewTransfers.cpp diff --git a/clientgui/BOINCBaseView.cpp b/clientgui/BOINCBaseView.cpp index 289fa76f01..e2065e2bf1 100644 --- a/clientgui/BOINCBaseView.cpp +++ b/clientgui/BOINCBaseView.cpp @@ -391,8 +391,11 @@ void CBOINCBaseView::EmptyTasks() { } -void CBOINCBaseView::UpdateSelection() -{} +void CBOINCBaseView::UpdateSelection(){ + wxASSERT(m_pTaskPane); + m_pTaskPane->UpdateControls(); + Layout(); +} bool CBOINCBaseView::_EnsureLastItemVisible() { diff --git a/clientgui/BOINCTaskCtrl.cpp b/clientgui/BOINCTaskCtrl.cpp index 65630ef6dc..576624e5a3 100644 --- a/clientgui/BOINCTaskCtrl.cpp +++ b/clientgui/BOINCTaskCtrl.cpp @@ -38,9 +38,9 @@ CBOINCTaskCtrl::CBOINCTaskCtrl(CBOINCBaseView* pView, wxWindowID iTaskWindowID, m_pParent = pView; m_pSizer = NULL; - EnableScrolling(true, true); SetVirtualSize( 200, 1000 ); - SetScrollRate( 10, 10 ); + EnableScrolling(false, true); + SetScrollRate( 0, 10 ); } diff --git a/clientgui/ViewMessages.cpp b/clientgui/ViewMessages.cpp index d4d34d0c4c..b2c4058ad6 100644 --- a/clientgui/ViewMessages.cpp +++ b/clientgui/ViewMessages.cpp @@ -277,6 +277,7 @@ bool CViewMessages::EnsureLastItemVisible() { void CViewMessages::UpdateSelection() { + CBOINCBaseView::UpdateSelection(); } diff --git a/clientgui/ViewProjects.cpp b/clientgui/ViewProjects.cpp index 3b7d523466..2d6bf7fb8b 100644 --- a/clientgui/ViewProjects.cpp +++ b/clientgui/ViewProjects.cpp @@ -614,7 +614,7 @@ void CViewProjects::UpdateSelection() { wxASSERT(pDoc); wxASSERT(wxDynamicCast(pDoc, CMainDocument)); - wxASSERT(NULL != m_pTaskPane); + wxASSERT(m_pTaskPane); // Update the tasks static box buttons // @@ -705,7 +705,7 @@ void CViewProjects::UpdateSelection() { m_bForceUpdateSelection = false; } - m_pTaskPane->UpdateControls(); + CBOINCBaseView::UpdateSelection(); } diff --git a/clientgui/ViewResources.cpp b/clientgui/ViewResources.cpp index 54053786ea..545494a04f 100644 --- a/clientgui/ViewResources.cpp +++ b/clientgui/ViewResources.cpp @@ -188,6 +188,7 @@ wxInt32 CViewResources::UpdateCache(long item, long column, wxString& strNewData void CViewResources::UpdateSelection() { + CBOINCBaseView::UpdateSelection(); } diff --git a/clientgui/ViewStatistics.cpp b/clientgui/ViewStatistics.cpp index c58fac85e3..3204536c97 100644 --- a/clientgui/ViewStatistics.cpp +++ b/clientgui/ViewStatistics.cpp @@ -479,6 +479,7 @@ void CViewStatistics::OnListRender( wxTimerEvent& WXUNUSED(event) ) { void CViewStatistics::UpdateSelection() { + CBOINCBaseView::UpdateSelection(); } diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp index 600c7ee46a..54aff949fd 100644 --- a/clientgui/ViewTransfers.cpp +++ b/clientgui/ViewTransfers.cpp @@ -349,6 +349,8 @@ void CViewTransfers::UpdateSelection() { } else { m_pTaskPane->DisableTaskGroupTasks(pGroup); } + + CBOINCBaseView::UpdateSelection(); }