MSW compilation fixes - widgets sample runs!

[wxWidgets.git] / src / common / dynarray.cpp

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index ed85392df3004ae66ad244ff6a98dc5da39978c5..5b4d11e9b9c5ef8a071123d16e53c5278eb4c77c 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -141,8 +141,6 @@ void wxBaseArray::Clear()
 // pre-allocates memory (frees the previous data!)
 void wxBaseArray::Alloc(size_t nSize)
 {
 // pre-allocates memory (frees the previous data!)
 void wxBaseArray::Alloc(size_t nSize)
 {

-  wxASSERT( nSize > 0 );
-

   // only if old buffer was not big enough
   if ( nSize > m_nSize ) {
     wxDELETEA(m_pItems);
   // only if old buffer was not big enough
   if ( nSize > m_nSize ) {
     wxDELETEA(m_pItems);


@@ -278,7 +276,7 @@ void wxBaseArray::Remove(long lItem)
   wxCHECK_RET( iIndex != wxNOT_FOUND,
                wxT("removing inexistent item in wxArray::Remove") );
 
   wxCHECK_RET( iIndex != wxNOT_FOUND,
                wxT("removing inexistent item in wxArray::Remove") );
 

-  Remove((size_t)iIndex);
+  RemoveAt((size_t)iIndex);

 }
 
 // sort array elements using passed comparaison function
 }
 
 // sort array elements using passed comparaison function