Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Morec ompilation fixes.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21777 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-07-08 21:58:01 +00:00
parent d5d58a93c3
commit 360b63dd32
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/html/htmltag.h
View File

@@ -20,6 +20,7 @@
#if wxUSE_HTML #if wxUSE_HTML
#include "wx/object.h" #include "wx/object.h"
#include "wx/arrstr.h"
class WXDLLIMPEXP_CORE wxColour; class WXDLLIMPEXP_CORE wxColour;
class WXDLLIMPEXP_HTML wxHtmlEntitiesParser; class WXDLLIMPEXP_HTML wxHtmlEntitiesParser;

32
src/common/dynarray.cpp
View File

@@ -378,6 +378,36 @@ void name::Remove(T lItem) \
void name::Sort(CMPFUNC fCmp) \ void name::Sort(CMPFUNC fCmp) \
{ \ { \
qsort(m_pItems, m_nCount, sizeof(T), 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 #endif
@@ -390,7 +420,7 @@ _WX_DEFINE_BASEARRAY(const void *, wxBaseArrayPtrVoid)
_WX_DEFINE_BASEARRAY(short, wxBaseArrayShort) _WX_DEFINE_BASEARRAY(short, wxBaseArrayShort)
_WX_DEFINE_BASEARRAY(int, wxBaseArrayInt) _WX_DEFINE_BASEARRAY(int, wxBaseArrayInt)
_WX_DEFINE_BASEARRAY(long, wxBaseArrayLong) _WX_DEFINE_BASEARRAY(long, wxBaseArrayLong)
//_WX_DEFINE_BASEARRAY(double, wxBaseArrayDouble) _WX_DEFINE_BASEARRAY(double, wxBaseArrayDouble)
#if wxUSE_STL #if wxUSE_STL
#include "wx/arrstr.h" #include "wx/arrstr.h"