X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a09307abba7f837d8bdd8879fe2457efd32e01a8..2903e6998a46a0b3504da30e21a9c28b344680ae:/include/wx/vector.h diff --git a/include/wx/vector.h b/include/wx/vector.h index 64b37b9885..ab07ca0f4a 100644 --- a/include/wx/vector.h +++ b/include/wx/vector.h @@ -169,6 +169,22 @@ public: wxVector() : m_size(0), m_capacity(0), m_values(NULL) {} + wxVector(size_type size) + : m_size(0), m_capacity(0), m_values(NULL) + { + reserve(size); + for ( size_t n = 0; n < size; n++ ) + push_back(value_type()); + } + + wxVector(size_type size, const value_type& v) + : m_size(0), m_capacity(0), m_values(NULL) + { + reserve(size); + for ( size_t n = 0; n < size; n++ ) + push_back(v); + } + wxVector(const wxVector& c) : m_size(0), m_capacity(0), m_values(NULL) { Copy(c); @@ -213,6 +229,22 @@ public: m_capacity = n; } + void resize(size_type n) + { + if ( n < m_size ) + Shrink(n); + else if ( n > m_size ) + Extend(n, value_type()); + } + + void resize(size_type n, const value_type& v) + { + if ( n < m_size ) + Shrink(n); + else if ( n > m_size ) + Extend(n, v); + } + size_type size() const { return m_size; @@ -370,6 +402,20 @@ private: } private: + void Shrink(size_type n) + { + for ( size_type i = n; i < m_size; i++ ) + m_values[i].~T(); + m_size = n; + } + + void Extend(size_type n, const value_type& v) + { + reserve(n); + for ( size_type i = m_size; i < n; i++ ) + push_back(v); + } + size_type m_size, m_capacity; value_type *m_values;