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

don't duplicate the column reordering in generic wxHeaderCtrl and wxGrid, extract it into a (public) helper function

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57264 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-12-11 22:27:02 +00:00
parent 3169a8e837
commit 1bb7462687
5 changed files with 63 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/generic/grid.cpp
View File

@@ -6781,37 +6781,15 @@ void wxGrid::DoEndDragMoveCol()
void wxGrid::SetColPos(int idx, int pos)
{
// we're going to need m_colAt now, initialize it if needed
if ( m_colAt.empty() )
{
// we're going to need m_colAt now, initialize it
m_colAt.reserve(m_numCols);
for ( int i = 0; i < m_numCols; i++ )
m_colAt.push_back(i);
}
// create the updated copy of m_colAt
const unsigned count = m_colAt.size();
wxArrayInt colAt;
colAt.reserve(count);
for ( unsigned n = 0; n < count; n++ )
{
// NB: order of checks is important for this to work when the new
// column position is the same as the old one
// insert the column at its new position
if ( colAt.size() == static_cast<unsigned>(pos) )
colAt.push_back(idx);
// delete the column from its old position
const int idxOld = m_colAt[n];
if ( idxOld == idx )
continue;
colAt.push_back(idxOld);
}
m_colAt = colAt;
wxHeaderCtrl::MoveColumnInOrderArray(m_colAt, idx, pos);
// also recalculate the column rights
if ( !m_colWidths.IsEmpty() )