Add files necessary to run Expat configure.

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

diff --git a/interface/wx/vector.h b/interface/wx/vector.h
index a85825f25800d72d3d01b35e0dd12f95e3cc2493..93af592cbe22a8446dbbaf20b95448c621877802 100644 (file)
--- a/interface/wx/vector.h
+++ b/interface/wx/vector.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxVector<T>
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     interface of wxVector<T>
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -20,7 +20,7 @@
     @nolibrary
     @category{containers}
 
     @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>
 */
 template<typename T>
 class wxVector<T>


@@ -34,31 +34,6 @@ public:
     typedef const value_type* const_iterator;
     typedef value_type& reference;
 
     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.
     */
     /**
         Constructor.
     */


@@ -77,7 +52,20 @@ public:
     wxVector(size_type size, const value_type& value);
 
     /**
     wxVector(size_type size, const value_type& value);
 
     /**

-        Copy onstructor.
+        Constructor initializing the vector with the elements in the given
+        range.
+
+        The @a InputIterator template parameter must be an input iterator type.
+        This constructor adds all elements from @a first until, not not
+        including, @a last to the vector.
+
+        @since 2.9.5
+     */
+    template <class InputIterator>
+    wxVector(InputIterator first, InputIterator last);
+
+    /**
+        Copy constructor.

     */
     wxVector(const wxVector<T>& c);
 
     */
     wxVector(const wxVector<T>& c);
 


@@ -86,6 +74,27 @@ public:
     */
     ~wxVector();
 
     */
     ~wxVector();
 

+    /**
+        Resizes the vector to @a n and assigns @a v to all elements.
+
+        @see resize()
+
+        @since 2.9.5
+     */
+    void assign(size_type n, const value_type& v);
+
+    /**
+        Assigns the elements in the given range to the vector.
+
+        The @a InputIterator template parameter must be an input iterator type.
+        This method clears the vector and then adds all elements from @a first
+        until, not not including, @a last to it.
+
+        @since 2.9.5
+     */
+    template <class InputIterator>
+    void assign(InputIterator first, InputIterator last);
+

     /**
         Returns item at position @a idx.
     */
     /**
         Returns item at position @a idx.
     */


@@ -120,7 +129,7 @@ public:
         Return reverse iterator to end of the vector.
     */
     reverse_iterator rbegin();
         Return reverse iterator to end of the vector.
     */
     reverse_iterator rbegin();

-    
+

     /**
         Return reverse iterator to beginning of the vector.
     */
     /**
         Return reverse iterator to beginning of the vector.
     */


@@ -128,7 +137,7 @@ public:
 
 
     /**
 
 
     /**

-        Returns vector's current capacity, i.e. how much memory is allocated.
+        Returns vector's current capacity, i.e.\ how much memory is allocated.

 
         @see reserve()
     */
 
         @see reserve()
     */


@@ -218,9 +227,49 @@ public:
     */
     void reserve(size_type n);
 
     */
     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;
     /**
         Returns the size of the vector.
     */
     size_type size() const;

+
+    /**
+        Efficiently exchanges contents of this vector with another one.
+
+        After the execution of this function the contents of this vector is
+        equal to the original contents of @a v and the contents of @a v becomes
+        the original contents of this vector without copying the data.
+
+        @since 2.9.1
+     */
+    void swap(wxVector& v);

 };
 
 };
 

+
+/**
+   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);