Resolve ambiguity between GetClientXXX() methods in wxOSX wxComboBox.

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

diff --git a/interface/wx/vector.h b/interface/wx/vector.h
index 093c7d1ca804e2e81a05593e1cd2f78209b3b655..ec5f3ed4016135d2997f264a557f0d05e6032ced 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>


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

-        Copy onstructor.
+        Copy constructor.

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


@@ -235,5 +235,32 @@ public:
         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);