X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3093cef829d26137a14303c36d592ed817da1028..68abfefc451b6c8a67e8fbd79e5009cf656bde34:/src/common/dynarray.cpp?ds=sidebyside diff --git a/src/common/dynarray.cpp b/src/common/dynarray.cpp index 4d13c80f0b..07d31a52ae 100644 --- a/src/common/dynarray.cpp +++ b/src/common/dynarray.cpp @@ -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, _T("bad index in wxArray::Insert") ); Grow(); @@ -263,7 +263,7 @@ void wxBaseArray::Insert(long lItem, size_t nIndex) // removes item from array (by index) void wxBaseArray::Remove(size_t nIndex) { - wxCHECK_RET( nIndex <= m_nCount, "bad index in wxArray::Remove" ); + wxCHECK_RET( nIndex <= m_nCount, _T("bad index in wxArray::Remove") ); memmove(&m_pItems[nIndex], &m_pItems[nIndex + 1], (m_nCount - nIndex - 1)*sizeof(long)); @@ -275,8 +275,8 @@ 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, + _T("removing inexistent item in wxArray::Remove") ); Remove((size_t)iIndex); }