From e068310a5a5fc97c6bd5149f140fbbea134d296d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 11 Dec 2008 13:45:04 +0000
Subject: [PATCH] added wxVector::resize()

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57248 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/vector.h       | 34 ++++++++++++++++++++++++++++++++--
 interface/wx/vector.h     | 15 ++++++++++++++-
 tests/vectors/vectors.cpp | 27 +++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 056202bcaa..ab07ca0f4a 100644
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -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;
diff --git a/interface/wx/vector.h b/interface/wx/vector.h
index a85825f258..093c7d1ca8 100644
--- a/interface/wx/vector.h
+++ b/interface/wx/vector.h
@@ -120,7 +120,7 @@ public:
         Return reverse iterator to end of the vector.
     */
     reverse_iterator rbegin();
-    
+
     /**
         Return reverse iterator to beginning of the vector.
     */
@@ -218,6 +218,19 @@ public:
     */
     void reserve(size_type n);
 
+    /**
+        Makes the vector of size @a n.
+
+        If @a n is less than the current size(), the elements at the end of the
+        vector are erased. If it is greater, then the vector is completed with
+        either the copies of the given object @a v or @c value_type() objects
+        until it becomes of size @a n.
+     */
+    //@{
+    void resize(size_type n);
+    void resize(size_type n, const value_type& v);
+    //@}
+
     /**
         Returns the size of the vector.
     */
diff --git a/tests/vectors/vectors.cpp b/tests/vectors/vectors.cpp
index 9f7ab2bab9..f93afddf7e 100644
--- a/tests/vectors/vectors.cpp
+++ b/tests/vectors/vectors.cpp
@@ -82,6 +82,7 @@ private:
         CPPUNIT_TEST( Iterators );
         CPPUNIT_TEST( Objects );
         CPPUNIT_TEST( NonPODs );
+        CPPUNIT_TEST( Resize );
     CPPUNIT_TEST_SUITE_END();
 
     void PushPopTest();
@@ -90,6 +91,7 @@ private:
     void Iterators();
     void Objects();
     void NonPODs();
+    void Resize();
 
     DECLARE_NO_COPY_CLASS(VectorsTestCase)
 };
@@ -239,3 +241,28 @@ void VectorsTestCase::NonPODs()
     vs.erase(vs.begin());
     vs.clear();
 }
+
+void VectorsTestCase::Resize()
+{
+    wxVector<CountedObject> v;
+    v.resize(3);
+
+    CPPUNIT_ASSERT_EQUAL( 3, v.size() );
+    CPPUNIT_ASSERT_EQUAL( 3, CountedObject::GetCount() );
+    CPPUNIT_ASSERT_EQUAL( 0, v[0].GetValue() );
+    CPPUNIT_ASSERT_EQUAL( 0, v[1].GetValue() );
+    CPPUNIT_ASSERT_EQUAL( 0, v[2].GetValue() );
+
+    v.resize(1);
+    CPPUNIT_ASSERT_EQUAL( 1, v.size() );
+    CPPUNIT_ASSERT_EQUAL( 1, CountedObject::GetCount() );
+
+    v.resize(4, CountedObject(17));
+    CPPUNIT_ASSERT_EQUAL( 4, v.size() );
+    CPPUNIT_ASSERT_EQUAL( 4, CountedObject::GetCount() );
+    CPPUNIT_ASSERT_EQUAL( 0, v[0].GetValue() );
+    CPPUNIT_ASSERT_EQUAL( 17, v[1].GetValue() );
+    CPPUNIT_ASSERT_EQUAL( 17, v[2].GetValue() );
+    CPPUNIT_ASSERT_EQUAL( 17, v[3].GetValue() );
+}
+
-- 
2.45.2