X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38723be1d50facc0176455b69b409dcd457ac07a..b09857ae000a60704207d63290be937584805fb0:/interface/wx/vector.h diff --git a/interface/wx/vector.h b/interface/wx/vector.h index 412330d380..21aaca5763 100644 --- a/interface/wx/vector.h +++ b/interface/wx/vector.h @@ -3,7 +3,7 @@ // Purpose: interface of wxVector // Author: wxWidgets team // RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /** @@ -34,31 +34,6 @@ public: 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. */ @@ -77,7 +52,7 @@ public: wxVector(size_type size, const value_type& value); /** - Copy onstructor. + Copy constructor. */ wxVector(const wxVector& c); @@ -86,6 +61,15 @@ public: */ ~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); + /** Returns item at position @a idx. */ @@ -128,7 +112,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() */ @@ -235,6 +219,17 @@ public: 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); }; @@ -248,7 +243,7 @@ public: ... // items are added to the vector v... wxVectorSort(v); @endcode - + @see wxVector */ template