Add length parameter to AddTextRaw and AppendTextRaw. Closes #1358

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

diff --git a/interface/wx/vector.h b/interface/wx/vector.h
index 65e39a4a1d4051002f4ebea226444a4c57769363..02e1a2728bc6916eb83b33b42d306fa28780194f 100644 (file)
--- a/interface/wx/vector.h
+++ b/interface/wx/vector.h
@@ -3,11 +3,10 @@
 // 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

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

-    @wxheader{vector.h}

 
     wxVector<T> is a template class which implements most of the @c std::vector
     class and can be used like it.
 
     wxVector<T> is a template class which implements most of the @c std::vector
     class and can be used like it.


@@ -21,14 +20,16 @@
     @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>
 {
 public:
     typedef size_t size_type;
 */
 template<typename T>
 class wxVector<T>
 {
 public:
     typedef size_t size_type;

+    typedef size_t difference_type;

     typedef T value_type;
     typedef T value_type;

+    typedef value_type* pointer;

     typedef value_type* iterator;
     typedef const value_type* const_iterator;
     typedef value_type& reference;
     typedef value_type* iterator;
     typedef const value_type* const_iterator;
     typedef value_type& reference;


@@ -39,7 +40,19 @@ public:
     wxVector();
 
     /**
     wxVector();
 
     /**

-        Copy onstructor.
+        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 constructor.

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


@@ -78,6 +91,17 @@ public:
     */
     iterator begin();
 
     */
     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.
 
     /**
         Returns vector's current capacity, i.e. how much memory is allocated.
 


@@ -169,9 +193,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);