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

wxString::rfind fixed for wxUSE_STL=0 from Robert Vazan.

Browse Source 
Added missing wxArrayString::reserve.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23287 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Mattia Barbon
2003-08-28 20:32:06 +00:00
parent b2bb920ff6
commit 93c83507aa
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/common/string.cpp
View File

@@ -509,13 +509,15 @@ size_t wxStringBase::rfind(wxChar ch, size_t nStart) const
wxASSERT( nStart <= length() ); wxASSERT( nStart <= length() );
} }
const wxChar *p = wxStrrchr(c_str(), ch); const wxChar *actual;
for ( actual = c_str() + ( nStart == npos ? length() : nStart + 1 );
actual > c_str(); --actual )
{
if ( *(actual - 1) == ch )
return (actual - 1) - c_str();
}
if ( p == NULL ) return npos;
return npos;
size_t result = p - c_str();
return ( result > nStart ) ? npos : result;
} }
size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart) const size_t wxStringBase::find_first_of(const wxChar* sz, size_t nStart) const
@@ -1961,6 +1963,11 @@ wxArrayString::~wxArrayString()
wxDELETEA(m_pItems); wxDELETEA(m_pItems);
} }
void wxArrayString::reserve(size_t nSize)
{
Alloc(nSize);
}
// pre-allocates memory (frees the previous data!) // pre-allocates memory (frees the previous data!)
void wxArrayString::Alloc(size_t nSize) void wxArrayString::Alloc(size_t nSize)
{ {