From 7d43ed0fb6e1874e2f0ff4355e0645d3b432ccae Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Thu, 27 Dec 2018 11:34:26 +0100 Subject: [PATCH] Iterate over all items of wxVector with column proportions with iterator --- src/propgrid/propgridpagestate.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/propgrid/propgridpagestate.cpp b/src/propgrid/propgridpagestate.cpp index 577071d8fc..f894b6fd0c 100644 --- a/src/propgrid/propgridpagestate.cpp +++ b/src/propgrid/propgridpagestate.cpp @@ -1143,20 +1143,19 @@ void wxPropertyGridPageState::CheckColumnWidths( int widthChange ) void wxPropertyGridPageState::ResetColumnSizes( int setSplitterFlags ) { - unsigned int i; // Calculate sum of proportions int psum = 0; - for ( i=0; i::const_iterator it = m_columnProportions.begin(); it != m_columnProportions.end(); ++it) + psum += *it; int puwid = (m_pPropGrid->m_width*256) / psum; int cpos = 0; // 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; cpos += cwid; - DoSetSplitterPosition(cpos, i, + DoSetSplitterPosition(cpos, (int)i, setSplitterFlags); } }