Patched to enable building on Debian/Alpha

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

diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp
index 4d13c80f0b72c45d03da839ae9827f027f8203ad..bbf54265c431b7eb1d996e0b5a9e224e001a773d 100644 (file)
--- a/src/common/dynarray.cpp
+++ b/src/common/dynarray.cpp
@@ -17,14 +17,14 @@
 #pragma implementation "dynarray.h"
 #endif
 
-#include  <wx/wxprec.h>
+#include  "wx/wxprec.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
@@ -188,7 +188,7 @@ int wxBaseArray::Index(long lItem, bool bFromEnd) const
     }
   }
 
-  return NOT_FOUND;
+  return wxNOT_FOUND;
 }
 
 // search for an item in a sorted array (binary search)
@@ -211,7 +211,7 @@ int wxBaseArray::Index(long lItem, CMPFUNC fnCompare) const
       return i;
   }
 
-  return NOT_FOUND;
+  return wxNOT_FOUND;
 }
 // add item at the end
 void wxBaseArray::Add(long lItem)
@@ -250,7 +250,7 @@ void wxBaseArray::Add(long lItem, CMPFUNC fnCompare)
 // add item at the given position
 void wxBaseArray::Insert(long lItem, size_t nIndex)
 {
-  wxCHECK_RET( nIndex <= m_nCount, "bad index in wxArray::Insert" );
+  wxCHECK_RET( nIndex <= m_nCount, wxT("bad index in wxArray::Insert") );
 
   Grow();
 
@@ -261,9 +261,9 @@ void wxBaseArray::Insert(long lItem, size_t nIndex)
 }
 
 // removes item from array (by index)
-void wxBaseArray::Remove(size_t nIndex)
+void wxBaseArray::RemoveAt(size_t nIndex)
 {
-  wxCHECK_RET( nIndex <= m_nCount, "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));
@@ -275,10 +275,10 @@ void wxBaseArray::Remove(long lItem)
 {
   int iIndex = Index(lItem);
 
-  wxCHECK_RET( iIndex != NOT_FOUND,
-               "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