added a test to check if wxHtmlWindow::SelectionToText() inserts \n characters correctly

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

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 85d925794371ef7e0b162d2def26a4ce7eaf8823..e2faf83569e9ac8c81c904370d5fc16e1b3d509f 100644 (file)
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -22,6 +22,7 @@
 #else // !wxUSE_STL
 
 #include "wx/utils.h"
+#include "wx/scopeguard.h"
 #include "wx/meta/movable.h"
 #include "wx/meta/if.h"
 
@@ -117,14 +118,58 @@ private:
 
 public:
     typedef size_t size_type;
+    typedef size_t difference_type;
     typedef T value_type;
+    typedef value_type* pointer;
     typedef value_type* iterator;
     typedef const value_type* const_iterator;
     typedef value_type& reference;
 
+    class reverse_iterator
+    {
+    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++(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 operator+(difference_type n) const
+                { return reverse_iterator(m_ptr - n); }
+        reverse_iterator& operator+=(difference_type n)
+                { return m_ptr -= n; return *this; }
+        reverse_iterator operator-(difference_type n) const
+                { return reverse_iterator(m_ptr + n); }
+        reverse_iterator& operator-=(difference_type n)
+                { return 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; }
+        bool operator !=(const reverse_iterator& it) const
+                { return m_ptr != it.m_ptr; }
+        
+    private:
+        value_type *m_ptr;
+    };
+
     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
 
-    wxVector(const wxVector& c)
+    wxVector(const wxVector& c) : m_size(0), m_capacity(0), m_values(NULL)
     {
         Copy(c);
     }
@@ -144,7 +189,8 @@ public:
 
         Ops::Free(m_values);
         m_values = NULL;
-        m_size = m_capacity = 0;
+        m_size =
+        m_capacity = 0;
     }
 
     void reserve(size_type n)
@@ -184,6 +230,7 @@ public:
 
     wxVector& operator=(const wxVector& vb)
     {
+        clear();
         Copy(vb);
         return *this;
     }
@@ -233,6 +280,9 @@ public:
     const_iterator end() const { return m_values + size(); }
     iterator end() { return m_values + size(); }
 
+    reverse_iterator rbegin() { return reverse_iterator(end() - 1); }
+    reverse_iterator rend() { return reverse_iterator(begin() - 1); }
+
     iterator insert(iterator it, const value_type& v = value_type())
     {
         // NB: this must be done before reserve(), because reserve()
@@ -242,39 +292,28 @@ public:
 
         reserve(size() + 1);
 
+        // the place where the new element is going to be inserted
+        value_type * const place = m_values + idx;
+
         // unless we're inserting at the end, move following elements out of
         // the way:
         if ( after > 0 )
-        {
-            Ops::MemmoveForward(m_values + idx + 1, m_values + idx, after);
-        }
+            Ops::MemmoveForward(place + 1, place, after);
 
-#if wxUSE_EXCEPTIONS
-        try
-        {
-#endif
-            // use placement new to initialize new object in preallocated place
-            // in m_values and store 'v' in it:
-            void* const place = m_values + idx;
-            new(place) value_type(v);
-#if wxUSE_EXCEPTIONS
-        }
-        catch ( ... )
-        {
-            // if the ctor threw an exception, we need to move all the elements
-            // back to their original positions in m_values
-            if ( after > 0 )
-            {
-                Ops::MemmoveBackward(m_values + idx, m_values + idx + 1, after);
-            }
-
-            throw; // rethrow the exception
-        }
-#endif // wxUSE_EXCEPTIONS
+        // if the ctor called below throws an exception, we need to move all
+        // the elements back to their original positions in m_values
+        wxScopeGuard moveBack = wxMakeGuard(
+                Ops::MemmoveBackward, place, place + 1, after);
+        if ( !after )
+            moveBack.Dismiss();
+
+        // use placement new to initialize new object in preallocated place in
+        // m_values and store 'v' in it:
+        new(place) value_type(v);
 
-        // increment m_size only if ctor didn't throw -- if it did, we'll be
-        // left with m_values larger than necessary, but number of elements will
-        // be the same
+        // now that we did successfully add the new element, increment the size
+        // and disable moving the items back
+        moveBack.Dismiss();
         m_size++;
 
         return begin() + idx;
@@ -321,7 +360,6 @@ private:
 
     void Copy(const wxVector& vb)
     {
-        clear();
         reserve(vb.size());
 
         for ( const_iterator i = vb.begin(); i != vb.end(); ++i )