Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't call wxYield() from EnsureVisible(), this is too dangerous - and unnecessary as well

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11163 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-23 15:54:41 +00:00
parent 91c6cc0e71
commit 34bbbc276d
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/generic/listctrl.cpp
View File

@@ -616,12 +616,17 @@ public:
// return the hit code for the corresponding position (in this line) // return the hit code for the corresponding position (in this line)
long HitTestLine(size_t line, int x, int y) const; long HitTestLine(size_t line, int x, int y) const;
// bring the selected item into view, scrolling to it if necessary
void MoveToItem(size_t item);
// bring the current item into view
void MoveToFocus() { MoveToItem(m_current); }
void EditLabel( long item ); void EditLabel( long item );
void OnRenameTimer(); void OnRenameTimer();
void OnRenameAccept(); void OnRenameAccept();
void OnMouse( wxMouseEvent &event ); void OnMouse( wxMouseEvent &event );
void MoveToFocus();
// called to switch the selection from the current item to newCurrent, // called to switch the selection from the current item to newCurrent,
void OnArrowChar( size_t newCurrent, const wxKeyEvent& event ); void OnArrowChar( size_t newCurrent, const wxKeyEvent& event );
@@ -662,7 +667,7 @@ public:
int GetSelectedItemCount(); int GetSelectedItemCount();
// set the scrollbars and update the positions of the items // set the scrollbars and update the positions of the items
void RecalculatePositions(); void RecalculatePositions(bool noRefresh = FALSE);
// refresh the window and the header // refresh the window and the header
void RefreshAll(); void RefreshAll();
@@ -2876,12 +2881,12 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
} }
} }
void wxListMainWindow::MoveToFocus() void wxListMainWindow::MoveToItem(size_t item)
{ {
if ( !HasCurrent() ) if ( item == (size_t)-1 )
return; return;
wxRect rect = GetLineRect(m_current); wxRect rect = GetLineRect(item);
int client_w, client_h; int client_w, client_h;
GetClientSize( &client_w, &client_h ); GetClientSize( &client_w, &client_h );
@@ -3619,7 +3624,7 @@ bool wxListMainWindow::GetItemPosition(long item, wxPoint& pos)
// geometry calculation // geometry calculation
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
void wxListMainWindow::RecalculatePositions() void wxListMainWindow::RecalculatePositions(bool noRefresh)
{ {
wxClientDC dc( this ); wxClientDC dc( this );
dc.SetFont( GetFont() ); dc.SetFont( GetFont() );
@@ -3721,11 +3726,14 @@ void wxListMainWindow::RecalculatePositions()
SetScrollbars( m_xScroll, m_yScroll, (entireWidth+SCROLL_UNIT_X) / m_xScroll, 0, scroll_pos, 0, TRUE ); SetScrollbars( m_xScroll, m_yScroll, (entireWidth+SCROLL_UNIT_X) / m_xScroll, 0, scroll_pos, 0, TRUE );
} }
if ( !noRefresh )
{
// FIXME: why should we call it from here? // FIXME: why should we call it from here?
UpdateCurrent(); UpdateCurrent();
RefreshAll(); RefreshAll();
} }
}
void wxListMainWindow::RefreshAll() void wxListMainWindow::RefreshAll()
{ {
@@ -3902,14 +3910,15 @@ void wxListMainWindow::EnsureVisible( long index )
_T("invalid index in EnsureVisible") ); _T("invalid index in EnsureVisible") );
// We have to call this here because the label in question might just have // We have to call this here because the label in question might just have
// been added and no screen update taken place. // been added and its position is not known yet
if ( m_dirty ) if ( m_dirty )
wxSafeYield(); {
m_dirty = FALSE;
size_t oldCurrent = m_current; RecalculatePositions(TRUE /* no refresh */);
m_current = (size_t)index; }
MoveToFocus();
m_current = oldCurrent; MoveToItem((size_t)index);
} }
long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) ) long wxListMainWindow::FindItem(long start, const wxString& str, bool WXUNUSED(partial) )