From 360b63dd328617a32752f61b45d347963c6c5ee1 Mon Sep 17 00:00:00 2001 From: Mattia Barbon Date: Tue, 8 Jul 2003 21:58:01 +0000 Subject: [PATCH] Morec ompilation fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/html/htmltag.h | 1 + src/common/dynarray.cpp | 32 +++++++++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/include/wx/html/htmltag.h b/include/wx/html/htmltag.h index 5df5fc3c14..f681056d58 100644 --- a/include/wx/html/htmltag.h +++ b/include/wx/html/htmltag.h @@ -20,6 +20,7 @@ #if wxUSE_HTML #include "wx/object.h" +#include "wx/arrstr.h" class WXDLLIMPEXP_CORE wxColour; class WXDLLIMPEXP_HTML wxHtmlEntitiesParser; diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index 7224e1db53..39db10d384 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -378,6 +378,36 @@ void name::Remove(T lItem) \ void name::Sort(CMPFUNC fCmp) \ { \ qsort(m_pItems, m_nCount, sizeof(T), fCmp); \ +} \ + \ +void name::assign(const_iterator first, const_iterator last) \ +{ \ + clear(); \ + reserve(last - first); \ + for(; first != last; ++first) \ + push_back(*first); \ +} \ + \ +void name::assign(size_type n, const_reference v) \ +{ \ + clear(); \ + reserve(n); \ + for( size_type i = 0; i < n; ++i ) \ + push_back(v); \ +} \ + \ +void name::insert(iterator it, const_iterator first, const_iterator last) \ +{ \ + size_t nInsert = last - first, nIndex = it - begin(); \ + if (nInsert == 0) \ + return; \ + Grow(nInsert); \ + \ + memmove(&m_pItems[nIndex + nInsert], &m_pItems[nIndex], \ + (m_nCount - nIndex)*sizeof(T)); \ + for (size_t i = 0; i < nInsert; ++i, ++it, ++first) \ + *it = *first; \ + m_nCount += nInsert; \ } #endif @@ -390,7 +420,7 @@ _WX_DEFINE_BASEARRAY(const void *, wxBaseArrayPtrVoid) _WX_DEFINE_BASEARRAY(short, wxBaseArrayShort) _WX_DEFINE_BASEARRAY(int, wxBaseArrayInt) _WX_DEFINE_BASEARRAY(long, wxBaseArrayLong) -//_WX_DEFINE_BASEARRAY(double, wxBaseArrayDouble) +_WX_DEFINE_BASEARRAY(double, wxBaseArrayDouble) #if wxUSE_STL #include "wx/arrstr.h" -- 2.45.2