X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c75cc2e832791a8d24b97d92491685e8e10e37f3..0dd9b9e2be1809f484b6447ad9525fa5b404ad95:/include/wx/dynarray.h

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index be59192bc2..9bdd300ee7 100644
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -120,6 +120,10 @@ classexp name : public std::vector<T>                               \
 public:                                                             \
   typedef wxArray_SortFunction<T>::CMPFUNC CMPFUNC;                 \
 public:                                                             \
+  name() : std::vector<T>() { }                                     \
+  name(size_type n) : std::vector<T>(n) { }                         \
+  name(size_type n, const_reference v) : std::vector<T>(n, v) { }   \
+                                                                    \
   void Empty() { clear(); }                                         \
   void Clear() { clear(); }                                         \
   void Alloc(size_t uiSize) { reserve(uiSize); }                    \
@@ -282,12 +286,16 @@ typedef int (CMPFUNC_CONV *CMPFUNC##T)(T *pItem1, T *pItem2);         \
 classexp name : public base                                           \
 {                                                                     \
 public:                                                               \
+  name() : base() { }                                                 \
+  name(size_type n) : base(n) { }                                     \
+  name(size_type n, const_reference v) : base(n, v) { }               \
+                                                                      \
   T& operator[](size_t uiIndex) const                                 \
     { return (T&)(base::operator[](uiIndex)); }                       \
   T& Item(size_t uiIndex) const                                       \
     { return (T&)/*const cast*/base::operator[](uiIndex); }           \
   T& Last() const                                                     \
-    { return Item(Count() - 1); }                                     \
+    { return Item(GetCount() - 1); }                                  \
                                                                       \
   int Index(T e, bool bFromEnd = false) const                         \
     { return base::Index(e, bFromEnd); }                              \
@@ -336,7 +344,7 @@ public:                                                               \
   T& Item(size_t uiIndex) const                                       \
     { return (T&)(base::operator[](uiIndex)); }                       \
   T& Last() const                                                     \
-    { return (T&)(base::operator[](Count() - 1)); }                   \
+    { return (T&)(base::operator[](GetCount() - 1)); }                \
                                                                       \
   int Index(T lItem, bool bFromEnd = false) const                     \
     { return base::Index((base_type)lItem, bFromEnd); }               \
@@ -438,6 +446,7 @@ public:                                                               \
     bool operator !=(const itor& it) const { return m_ptr != it.m_ptr; }\
   };                                                                  \
                                                                       \
+  name(size_type n) { assign(n, value_type()); }                      \
   name(size_type n, const_reference v) { assign(n, v); }              \
   name(const_iterator first, const_iterator last)                     \
     { assign(first, last); }                                          \
@@ -472,7 +481,7 @@ public:                                                               \
   const_reverse_iterator rbegin() const;                              \
   reverse_iterator rend() { return reverse_iterator(begin() - 1); }   \
   const_reverse_iterator rend() const;                                \
-  void reserve(size_type n) { base::reserve(n); };                    \
+  void reserve(size_type n) { base::reserve(n); }                     \
   void resize(size_type n, value_type v = value_type())               \
     { base::resize(n, v); }                                           \
 }
@@ -557,7 +566,8 @@ public:                                                                  \
                                                                          \
   ~name();                                                               \
                                                                          \
-  void Alloc(size_t count) { reserve(count); }                           \
+  void Alloc(size_t count) { base::reserve(count); }                     \
+  void reserve(size_t count) { base::reserve(count); }                   \
   size_t GetCount() const { return base_array::size(); }                 \
   size_t size() const { return base_array::size(); }                     \
   bool IsEmpty() const { return base_array::empty(); }                   \
@@ -1006,7 +1016,7 @@ WX_DEFINE_USER_EXPORTED_ARRAY_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE
 #define WX_PREPEND_ARRAY(array, other)                                        \
     {                                                                         \
         size_t wxAAcnt = (other).size();                                      \
-        (array).Alloc(wxAAcnt);                                               \
+        (array).reserve(wxAAcnt);                                             \
         for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ )                    \
         {                                                                     \
             (array).Insert((other)[wxAAn], wxAAn);                            \
@@ -1017,7 +1027,7 @@ WX_DEFINE_USER_EXPORTED_ARRAY_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE
 #define WX_APPEND_ARRAY(array, other)                                         \
     {                                                                         \
         size_t wxAAcnt = (other).size();                                      \
-        (array).Alloc(wxAAcnt);                                               \
+        (array).reserve(wxAAcnt);                                             \
         for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ )                    \
         {                                                                     \
             (array).push_back((other)[wxAAn]);                                \