set wxUSE_STD_STRING to 1 by default

[wxWidgets.git] / include / wx / dynarray.h

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 4c2584fb49662abcfcc1cd5f0ee321645aeba90e..b99ed6a64bee34baec62a2b258dbb141ff4b89ef 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -169,7 +169,7 @@ public:                                                             \
                                                                     \
   void Empty() { m_nCount = 0; }                                    \
   void Clear();                                                     \
                                                                     \
   void Empty() { m_nCount = 0; }                                    \
   void Clear();                                                     \

-  void Alloc(size_t uiSize);                                        \
+  void Alloc(size_t n) { if ( n > m_nSize ) Realloc(n); }           \

   void Shrink();                                                    \
                                                                     \
   size_t GetCount() const { return m_nCount; }                      \
   void Shrink();                                                    \
                                                                     \
   size_t GetCount() const { return m_nCount; }                      \


@@ -225,7 +225,7 @@ protected:                                                          \
   void insert(iterator it, const_iterator first, const_iterator last);\
   void pop_back() { RemoveAt(size() - 1); }                         \
   void push_back(const value_type& v) { Add(v); }                   \
   void insert(iterator it, const_iterator first, const_iterator last);\
   void pop_back() { RemoveAt(size() - 1); }                         \
   void push_back(const value_type& v) { Add(v); }                   \

-  void reserve(size_type n) { if(n > m_nSize) Realloc(n); }         \
+  void reserve(size_type n) { Alloc(n); }                           \

   void resize(size_type n, value_type v = value_type())             \
     { SetCount(n, v); }                                             \
                                                                     \
   void resize(size_type n, value_type v = value_type())             \
     { SetCount(n, v); }                                             \
                                                                     \