X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/12f5e1e78fe906050ff2fee9529476db332633f0..427861bde09badef1a2950ad799e69fac6b4a48a:/interface/wx/vector.h?ds=sidebyside

diff --git a/interface/wx/vector.h b/interface/wx/vector.h
index 34f32230cf..412330d380 100644
--- a/interface/wx/vector.h
+++ b/interface/wx/vector.h
@@ -20,23 +20,62 @@
     @nolibrary
     @category{containers}
 
-    @see @ref overview_container, wxList<T>, wxArray<T>
+    @see @ref overview_container, wxList<T>, wxArray<T>, wxVectorSort<T>
 */
 template<typename T>
 class wxVector<T>
 {
 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;
 
+    /**
+        Reverse iterator interface
+    */
+    class reverse_iterator
+    {
+    public:
+        reverse_iterator();
+        explicit reverse_iterator(iterator it);
+        reverse_iterator(const reverse_iterator& it);
+        reference operator*() const;
+        pointer operator->() const;
+        iterator base() const;
+        reverse_iterator& operator++();
+        reverse_iterator operator++(int);
+        reverse_iterator& operator--();
+        reverse_iterator operator--(int);
+        reverse_iterator operator+(difference_type n) const;
+        reverse_iterator& operator+=(difference_type n);
+        reverse_iterator operator-(difference_type n) const;
+        reverse_iterator& operator-=(difference_type n);
+        reference operator[](difference_type n) const;
+        bool operator ==(const reverse_iterator& it) const;
+        bool operator !=(const reverse_iterator& it) const;
+    };
+
     /**
         Constructor.
     */
     wxVector();
 
+    /**
+        Constructor initializing the vector with the given number of
+        default-constructed objects.
+     */
+    wxVector(size_type size);
+
+    /**
+        Constructor initializing the vector with the given number of
+        copies of the given object.
+     */
+    wxVector(size_type size, const value_type& value);
+
     /**
         Copy onstructor.
     */
@@ -77,6 +116,17 @@ public:
     */
     iterator begin();
 
+    /**
+        Return reverse iterator to end of the vector.
+    */
+    reverse_iterator rbegin();
+
+    /**
+        Return reverse iterator to beginning of the vector.
+    */
+    reverse_iterator rend();
+
+
     /**
         Returns vector's current capacity, i.e. how much memory is allocated.
 
@@ -168,9 +218,38 @@ 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.
     */
     size_type size() const;
 };
 
+
+/**
+   Sort the contents of a @c wxVector<T>.  In a STL build this function will
+   be defined as a thin wrapper around std::sort.  To be sortable the
+   contained type must support the less-than operator.
+
+   @code
+   wxVector<SomeClass> v;
+   ... // items are added to the vector v...
+   wxVectorSort(v);
+   @endcode
+      
+   @see wxVector<T>
+*/
+template<typename T>
+void wxVectorSort(wxVector<T>& v);