added wxVector::resize()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -170,7 +170,7 @@ public:
|
||||
wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
|
||||
|
||||
wxVector(size_type size)
|
||||
: m_size(0), m_capacity(0), m_values(NULL)
|
||||
: m_size(0), m_capacity(0), m_values(NULL)
|
||||
{
|
||||
reserve(size);
|
||||
for ( size_t n = 0; n < size; n++ )
|
||||
@@ -178,7 +178,7 @@ public:
|
||||
}
|
||||
|
||||
wxVector(size_type size, const value_type& v)
|
||||
: m_size(0), m_capacity(0), m_values(NULL)
|
||||
: m_size(0), m_capacity(0), m_values(NULL)
|
||||
{
|
||||
reserve(size);
|
||||
for ( size_t n = 0; n < size; n++ )
|
||||
@@ -229,6 +229,22 @@ public:
|
||||
m_capacity = n;
|
||||
}
|
||||
|
||||
void resize(size_type n)
|
||||
{
|
||||
if ( n < m_size )
|
||||
Shrink(n);
|
||||
else if ( n > m_size )
|
||||
Extend(n, value_type());
|
||||
}
|
||||
|
||||
void resize(size_type n, const value_type& v)
|
||||
{
|
||||
if ( n < m_size )
|
||||
Shrink(n);
|
||||
else if ( n > m_size )
|
||||
Extend(n, v);
|
||||
}
|
||||
|
||||
size_type size() const
|
||||
{
|
||||
return m_size;
|
||||
@@ -386,6 +402,20 @@ private:
|
||||
}
|
||||
|
||||
private:
|
||||
void Shrink(size_type n)
|
||||
{
|
||||
for ( size_type i = n; i < m_size; i++ )
|
||||
m_values[i].~T();
|
||||
m_size = n;
|
||||
}
|
||||
|
||||
void Extend(size_type n, const value_type& v)
|
||||
{
|
||||
reserve(n);
|
||||
for ( size_type i = m_size; i < n; i++ )
|
||||
push_back(v);
|
||||
}
|
||||
|
||||
size_type m_size,
|
||||
m_capacity;
|
||||
value_type *m_values;
|
||||
|
Reference in New Issue
Block a user