use Alloc() in WX_PRE/APPEND_ARRAY (part of patch 1590194)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dynarray.h b/include/wx/dynarray.h
index 05e6d5e70ea00fa75a8eec18bf7cb255f9ae1378..be1a50a4db4ac29c9613441a4669e39d381aff26 100644 (file)
--- a/include/wx/dynarray.h
+++ b/include/wx/dynarray.h
@@ -973,6 +973,7 @@ WX_DEFINE_USER_EXPORTED_ARRAY_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE
 #define WX_PREPEND_ARRAY(array, other)                                        \
     {                                                                         \
         size_t wxAAcnt = (other).size();                                      \
 #define WX_PREPEND_ARRAY(array, other)                                        \
     {                                                                         \
         size_t wxAAcnt = (other).size();                                      \

+        (array).Alloc(wxAAcnt);                                               \

         for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ )                    \
         {                                                                     \
             (array).Insert((other)[wxAAn], wxAAn);                            \
         for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ )                    \
         {                                                                     \
             (array).Insert((other)[wxAAn], wxAAn);                            \


@@ -983,6 +984,7 @@ WX_DEFINE_USER_EXPORTED_ARRAY_PTR(void *, wxArrayPtrVoid, class WXDLLIMPEXP_BASE
 #define WX_APPEND_ARRAY(array, other)                                         \
     {                                                                         \
         size_t wxAAcnt = (other).size();                                      \
 #define WX_APPEND_ARRAY(array, other)                                         \
     {                                                                         \
         size_t wxAAcnt = (other).size();                                      \

+        (array).Alloc(wxAAcnt);                                               \

         for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ )                    \
         {                                                                     \
             (array).push_back((other)[wxAAn]);                                \
         for ( size_t wxAAn = 0; wxAAn < wxAAcnt; wxAAn++ )                    \
         {                                                                     \
             (array).push_back((other)[wxAAn]);                                \