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

added wxArray::SetCount()

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-01-25 23:47:33 +00:00
parent 0bbe4e299c
commit 2abb9d2f17
3 changed files with 62 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docs/latex/wx/array.tex
View File

@@ -201,6 +201,7 @@ does exactly the same as \helpref{Item()}{wxarrayitem} method.
\helpref{Add}{wxarrayadd}\\ \helpref{Add}{wxarrayadd}\\
\helpref{Insert}{wxarrayinsert}\\ \helpref{Insert}{wxarrayinsert}\\
\helpref{SetCount}{wxarraysetcount}\\
\helpref{WX\_APPEND\_ARRAY}{wxappendarray} \helpref{WX\_APPEND\_ARRAY}{wxappendarray}
\membersection{Removing items} \membersection{Removing items}
@@ -590,6 +591,19 @@ array.RemoveAt(n)
See also \helpref{WX\_CLEAR\_ARRAY}{wxcleararray} macro which deletes all See also \helpref{WX\_CLEAR\_ARRAY}{wxcleararray} macro which deletes all
elements of a wxArray (supposed to contain pointers). elements of a wxArray (supposed to contain pointers).
\membersection{wxArray::SetCount}\label{wxarraysetcount}
\func{void}{SetCount}{\param{size\_t }{count}, \param{T }{defval = T($0$)}}
This function ensures that the number of array elements is at least
{\it count}. If the array has already {\it count} or mroe items, nothing is
done. Otherwise, {\tt count - GetCount()} elements are added and initialized to
the value {\it defval}.
\wxheading{See also}
\helpref{GetCount}{wxarraygetcount}
\membersection{wxArray::Shrink}\label{wxarrayshrink} \membersection{wxArray::Shrink}\label{wxarrayshrink}
\func{void}{Shrink}{\void} \func{void}{Shrink}{\void}

12
include/wx/dynarray.h
View File

@@ -90,11 +90,13 @@ public: \
void Alloc(size_t uiSize); \ void Alloc(size_t uiSize); \
void Shrink(); \ void Shrink(); \
\ \
size_t GetCount() const { return m_nCount; } \ size_t GetCount() const { return m_nCount; } \
bool IsEmpty() const { return m_nCount == 0; } \ void SetCount(size_t n, T defval = T(0)); \
size_t Count() const { return m_nCount; } \ bool IsEmpty() const { return m_nCount == 0; } \
size_t Count() const { return m_nCount; } \
\ \
typedef T base_type; \ typedef T base_type; \
\
protected: \ protected: \
T& Item(size_t uiIndex) const \ T& Item(size_t uiIndex) const \
{ wxASSERT( uiIndex < m_nCount ); return m_pItems[uiIndex]; } \ { wxASSERT( uiIndex < m_nCount ); return m_pItems[uiIndex]; } \
@@ -112,8 +114,8 @@ protected: \
void Sort(CMPFUNC fnCompare); \ void Sort(CMPFUNC fnCompare); \
\ \
private: \ private: \
\ void Grow(size_t nIncrement = 0); \
void Grow(size_t nIncrement = 0); \ bool Realloc(size_t nSize); \
\ \
size_t m_nSize, \ size_t m_nSize, \
m_nCount; \ m_nCount; \

50
src/common/dynarray.cpp
View File

@@ -106,6 +106,23 @@ name& name::operator=(const name& src) \
return *this; \ return *this; \
} \ } \
\ \
/* allocate new buffer of the given size and move our data to it */ \
bool name::Realloc(size_t nSize) \
{ \
T *pNew = new T[nSize]; \
/* only grow if allocation succeeded */ \
if ( !pNew ) \
return false; \
\
m_nSize = nSize; \
/* copy data to new location */ \
memcpy(pNew, m_pItems, m_nCount*sizeof(T)); \
delete [] m_pItems; \
m_pItems = pNew; \
\
return true; \
} \
\
/* grow the array */ \ /* grow the array */ \
void name::Grow(size_t nIncrement) \ void name::Grow(size_t nIncrement) \
{ \ { \
@@ -131,19 +148,34 @@ void name::Grow(size_t nIncrement) \
ndefIncrement = ARRAY_MAXSIZE_INCREMENT; \ ndefIncrement = ARRAY_MAXSIZE_INCREMENT; \
if ( nIncrement < ndefIncrement ) \ if ( nIncrement < ndefIncrement ) \
nIncrement = ndefIncrement; \ nIncrement = ndefIncrement; \
T *pNew = new T[m_nSize + nIncrement]; \ Realloc(m_nSize + nIncrement); \
/* only grow if allocation succeeded */ \
if ( pNew ) { \
m_nSize += nIncrement; \
/* copy data to new location */ \
memcpy(pNew, m_pItems, m_nCount*sizeof(T)); \
delete [] m_pItems; \
m_pItems = pNew; \
} \
} \ } \
} \ } \
} \ } \
\ \
/* make sure that the array has at least count elements */ \
void name::SetCount(size_t count, T defval) \
{ \
if ( m_nSize < count ) \
{ \
/* need to realloc memory: don't overallocate it here as if */ \
/* SetCount() is called, it probably means that the caller */ \
/* knows in advance how many elements there will be in the */ \
/* array and so it won't be necessary to realloc it later */ \
if ( !Realloc(count) ) \
{ \
/* out of memory -- what can we do? */ \
return; \
} \
} \
\
/* add new elements if we extend the array */ \
while ( m_nCount < count ) \
{ \
m_pItems[m_nCount++] = defval; \
} \
} \
\
/* dtor */ \ /* dtor */ \
name::~name() \ name::~name() \
{ \ { \