X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2e8fd8cc4048df85f26dc7e7319adf52073081b8..68e6eb7d678e41eb3949fc682b7a9329bff2f3ec:/include/wx/vector.h

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 78a91b8dfe..28230a9ea5 100644
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -13,7 +13,6 @@
 #define _WX_VECTOR_H_
 
 #include "wx/defs.h"
-#include "wx/dataobj.h"
 
 #if wxUSE_STL
 
@@ -170,19 +169,19 @@ public:
 
     wxVector() : m_size(0), m_capacity(0), m_values(NULL) {}
 
-    wxVector(size_type size)
+    wxVector(size_type p_size)
         : m_size(0), m_capacity(0), m_values(NULL)
     {
-        reserve(size);
-        for ( size_t n = 0; n < size; n++ )
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
             push_back(value_type());
     }
 
-    wxVector(size_type size, const value_type& v)
+    wxVector(size_type p_size, const value_type& v)
         : m_size(0), m_capacity(0), m_values(NULL)
     {
-        reserve(size);
-        for ( size_t n = 0; n < size; n++ )
+        reserve(p_size);
+        for ( size_t n = 0; n < p_size; n++ )
             push_back(v);
     }
 
@@ -196,6 +195,13 @@ public:
         clear();
     }
 
+    void swap(wxVector& v)
+    {
+        wxSwap(m_size, v.m_size);
+        wxSwap(m_capacity, v.m_capacity);
+        wxSwap(m_values, v.m_values);
+    }
+
     void clear()
     {
         // call destructors of stored objects: