1. added wxAssertIsEqual() function to be used in wxASSERT()

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

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index 07d31a52aef641a810f790420e3602975382a804..5b4d11e9b9c5ef8a071123d16e53c5278eb4c77c 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -17,14 +17,14 @@
 #pragma implementation "dynarray.h"
 #endif
 
 #pragma implementation "dynarray.h"
 #endif
 

-#include  <wx/wxprec.h>
+#include  "wx/wxprec.h"

 
 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif
 
 #include "wx/dynarray.h"
 
 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif
 
 #include "wx/dynarray.h"

-#include <wx/intl.h>
+#include "wx/intl.h"

 
 #include <stdlib.h>
 #include <string.h> // for memmove
 
 #include <stdlib.h>
 #include <string.h> // for memmove


@@ -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);


@@ -250,7 +248,7 @@ void wxBaseArray::Add(long lItem, CMPFUNC fnCompare)
 // add item at the given position
 void wxBaseArray::Insert(long lItem, size_t nIndex)
 {
 // add item at the given position
 void wxBaseArray::Insert(long lItem, size_t nIndex)
 {

-  wxCHECK_RET( nIndex <= m_nCount, _T("bad index in wxArray::Insert") );
+  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::Insert") );

 
   Grow();
 
 
   Grow();
 


@@ -261,9 +259,9 @@ void wxBaseArray::Insert(long lItem, size_t nIndex)
 }
 
 // removes item from array (by index)
 }
 
 // removes item from array (by index)

-void wxBaseArray::Remove(size_t nIndex)
+void wxBaseArray::RemoveAt(size_t nIndex)

 {
 {

-  wxCHECK_RET( nIndex <= m_nCount, _T("bad index in wxArray::Remove") );
+  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::RemoveAt") );

 
   memmove(&m_pItems[nIndex], &m_pItems[nIndex + 1],
           (m_nCount - nIndex - 1)*sizeof(long));
 
   memmove(&m_pItems[nIndex], &m_pItems[nIndex + 1],
           (m_nCount - nIndex - 1)*sizeof(long));


@@ -276,9 +274,9 @@ void wxBaseArray::Remove(long lItem)
   int iIndex = Index(lItem);
 
   wxCHECK_RET( iIndex != wxNOT_FOUND,
   int iIndex = Index(lItem);
 
   wxCHECK_RET( iIndex != wxNOT_FOUND,

-               _T("removing inexistent item in wxArray::Remove") );
+               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