don't use GetParent() in GetParentForModalDialog() itself as it can be called before...

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 2337d3d326b825b7cefb27d2316dc307dea38f45..ab07ca0f4a8c1eb0f7c8f955e5db0fbca4d5f587 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -80,7 +80,7 @@ struct wxVectorMemOpsGeneric
         T* sourceptr = source;
         for ( size_t i = count; i > 0; --i, ++destptr, ++sourceptr )
         {
-            new(destptr) T(*sourceptr);
+            ::new(destptr) T(*sourceptr);
             sourceptr->~T();
         }
     }
@@ -92,7 +92,7 @@ struct wxVectorMemOpsGeneric
         T* sourceptr = source + count - 1;
         for ( size_t i = count; i > 0; --i, --destptr, --sourceptr )
         {
-            new(destptr) T(*sourceptr);
+            ::new(destptr) T(*sourceptr);
             sourceptr->~T();
         }
     }
@@ -169,6 +169,22 @@ public:
 
     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
 
+    wxVector(size_type size)
+        : m_size(0), m_capacity(0), m_values(NULL)
+    {
+        reserve(size);
+        for ( size_t n = 0; n < size; n++ )
+            push_back(value_type());
+    }
+
+    wxVector(size_type size, const value_type& v)
+        : m_size(0), m_capacity(0), m_values(NULL)
+    {
+        reserve(size);
+        for ( size_t n = 0; n < size; n++ )
+            push_back(v);
+    }
+
     wxVector(const wxVector& c) : m_size(0), m_capacity(0), m_values(NULL)
     {
         Copy(c);
@@ -213,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;
@@ -230,8 +262,11 @@ public:
 
     wxVector& operator=(const wxVector& vb)
     {
-        clear();
-        Copy(vb);
+        if (this != &vb)
+        {
+            clear();
+            Copy(vb);
+        }
         return *this;
     }
 
@@ -309,7 +344,7 @@ public:
 
         // use placement new to initialize new object in preallocated place in
         // m_values and store 'v' in it:
-        new(place) value_type(v);
+        ::new(place) value_type(v);
 
         // now that we did successfully add the new element, increment the size
         // and disable moving the items back
@@ -367,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;