Some wxComboCtrlBase member functions were enclosed within incorrect compatibility...

[wxWidgets.git] / include / wx / vector.h

diff --git a/include/wx/vector.h b/include/wx/vector.h
index cf8e69c6e4e46c78dbd4114cfc62919f056acb92..28230a9ea5c2d609836f9f8ccb890a9cbb2e556b 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -169,19 +169,19 @@ public:
 
     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
 
-    wxVector(size_type size)
-        : m_size(0), m_capacity(0), m_values(NULL) 
+    wxVector(size_type p_size)
+        : m_size(0), m_capacity(0), m_values(NULL)
     {
-        reserve(size);
-        for ( size_t n = 0; n < size; n++ )
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
             push_back(value_type());
     }
 
-    wxVector(size_type size, const value_type& v)
-        : m_size(0), m_capacity(0), m_values(NULL) 
+    wxVector(size_type p_size, const value_type& v)
+        : m_size(0), m_capacity(0), m_values(NULL)
     {
-        reserve(n);
-        for ( size_t n = 0; n < size; n++ )
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
             push_back(v);
     }
 
@@ -195,6 +195,13 @@ public:
         clear();
     }
 
+    void swap(wxVector& v)
+    {
+        wxSwap(m_size, v.m_size);
+        wxSwap(m_capacity, v.m_capacity);
+        wxSwap(m_values, v.m_values);
+    }
+
     void clear()
     {
         // call destructors of stored objects:
@@ -229,6 +236,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 +409,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;