Iterate over all items of wxVector with column proportions with iterator
This commit is contained in:
@@ -1143,20 +1143,19 @@ void wxPropertyGridPageState::CheckColumnWidths( int widthChange )
|
|||||||
|
|
||||||
void wxPropertyGridPageState::ResetColumnSizes( int setSplitterFlags )
|
void wxPropertyGridPageState::ResetColumnSizes( int setSplitterFlags )
|
||||||
{
|
{
|
||||||
unsigned int i;
|
|
||||||
// Calculate sum of proportions
|
// Calculate sum of proportions
|
||||||
int psum = 0;
|
int psum = 0;
|
||||||
for ( i=0; i<m_colWidths.size(); i++ )
|
for (wxVector<int>::const_iterator it = m_columnProportions.begin(); it != m_columnProportions.end(); ++it)
|
||||||
psum += m_columnProportions[i];
|
psum += *it;
|
||||||
int puwid = (m_pPropGrid->m_width*256) / psum;
|
int puwid = (m_pPropGrid->m_width*256) / psum;
|
||||||
int cpos = 0;
|
int cpos = 0;
|
||||||
|
|
||||||
// Convert proportion to splitter positions
|
// Convert proportion to splitter positions
|
||||||
for ( i=0; i<(m_colWidths.size() - 1); i++ )
|
for (size_t i=0; i<(m_colWidths.size() - 1); i++)
|
||||||
{
|
{
|
||||||
int cwid = (puwid*m_columnProportions[i]) / 256;
|
int cwid = (puwid*m_columnProportions[i]) / 256;
|
||||||
cpos += cwid;
|
cpos += cwid;
|
||||||
DoSetSplitterPosition(cpos, i,
|
DoSetSplitterPosition(cpos, (int)i,
|
||||||
setSplitterFlags);
|
setSplitterFlags);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user