added wxDataViewModel::HasContainerColumns

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

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index d94afc572ec068e03bc186f3305f304836b166c6..535642547589d3dd1d41ec65aa5688ce625e73c4 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -472,7 +472,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 +557,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 +1007,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 +1018,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]);                                \