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 e2faf83569e9ac8c81c904370d5fc16e1b3d509f..28230a9ea5c2d609836f9f8ccb890a9cbb2e556b 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -66,7 +66,7 @@ struct wxVectorMemOpsGeneric
         T *mem = (T*)::operator new(newCapacity * sizeof(T));
         for ( size_t i = 0; i < occupiedSize; i++ )
         {
-            new(mem + i) T(old[i]);
+            ::new(mem + i) T(old[i]);
             old[i].~T();
         }
         ::operator delete(old);
@@ -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();
         }
     }
@@ -131,44 +131,60 @@ public:
         reverse_iterator() : m_ptr(NULL) { }
         wxEXPLICIT reverse_iterator(iterator it) : m_ptr(it) { }
         reverse_iterator(const reverse_iterator& it) : m_ptr(it.m_ptr) { }
-        
+
         reference operator*() const { return *m_ptr; }
         pointer operator->() const { return m_ptr; }
-        
+
         iterator base() const { return m_ptr; }
-        
-        reverse_iterator& operator++() 
-                { --m_ptr; return *this; }
+
+        reverse_iterator& operator++()
+            { --m_ptr; return *this; }
         reverse_iterator operator++(int)
-                { reverse_iterator tmp = *this; --m_ptr; return tmp; }
-        reverse_iterator& operator--() 
-                { ++m_ptr; return *this; }
-        reverse_iterator operator--(int) 
-                { reverse_iterator tmp = *this; ++m_ptr; return tmp; }
-        
+            { reverse_iterator tmp = *this; --m_ptr; return tmp; }
+        reverse_iterator& operator--()
+            { ++m_ptr; return *this; }
+        reverse_iterator operator--(int)
+            { reverse_iterator tmp = *this; ++m_ptr; return tmp; }
+
         reverse_iterator operator+(difference_type n) const
-                { return reverse_iterator(m_ptr - n); }
+            { return reverse_iterator(m_ptr - n); }
         reverse_iterator& operator+=(difference_type n)
-                { return m_ptr -= n; return *this; }
+            { m_ptr -= n; return *this; }
         reverse_iterator operator-(difference_type n) const
-                { return reverse_iterator(m_ptr + n); }
+            { return reverse_iterator(m_ptr + n); }
         reverse_iterator& operator-=(difference_type n)
-                { return m_ptr += n; return *this; }
-                
+            { m_ptr += n; return *this; }
+
         reference operator[](difference_type n) const
-                { return *(*this + n); }
-        
-        bool operator ==(const reverse_iterator& it) const 
-                { return m_ptr == it.m_ptr; }
+            { return *(*this + n); }
+
+        bool operator ==(const reverse_iterator& it) const
+            { return m_ptr == it.m_ptr; }
         bool operator !=(const reverse_iterator& it) const
-                { return m_ptr != it.m_ptr; }
-        
+            { return m_ptr != it.m_ptr; }
+
     private:
         value_type *m_ptr;
     };
 
     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
 
+    wxVector(size_type p_size)
+        : m_size(0), m_capacity(0), m_values(NULL)
+    {
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
+            push_back(value_type());
+    }
+
+    wxVector(size_type p_size, const value_type& v)
+        : m_size(0), m_capacity(0), m_values(NULL)
+    {
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
+            push_back(v);
+    }
+
     wxVector(const wxVector& c) : m_size(0), m_capacity(0), m_values(NULL)
     {
         Copy(c);
@@ -179,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:
@@ -213,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;
@@ -230,8 +269,11 @@ public:
 
     wxVector& operator=(const wxVector& vb)
     {
-        clear();
-        Copy(vb);
+        if (this != &vb)
+        {
+            clear();
+            Copy(vb);
+        }
         return *this;
     }
 
@@ -242,7 +284,7 @@ public:
         // use placement new to initialize new object in preallocated place in
         // m_values and store 'v' in it:
         void* const place = m_values + m_size;
-        new(place) value_type(v);
+        ::new(place) value_type(v);
 
         // only increase m_size if the ctor didn't throw an exception; notice
         // that if it _did_ throw, everything is OK, because we only increased
@@ -309,7 +351,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 +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;