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

fixed bugs in rfind() (patch 481325)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12404 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-11-13 18:50:05 +00:00
parent 84f7908b99
commit 19a2deddc5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/string.cpp
View File

@@ -1698,7 +1698,7 @@ size_t wxString::find(wxChar ch, size_t nStart) const
size_t wxString::rfind(const wxString& str, size_t nStart) const size_t wxString::rfind(const wxString& str, size_t nStart) const
{ {
wxASSERT( str.GetStringData()->IsValid() ); wxASSERT( str.GetStringData()->IsValid() );
wxASSERT( nStart <= Len() ); wxASSERT( nStart == npos || nStart <= Len() );
// TODO could be made much quicker than that // TODO could be made much quicker than that
const wxChar *p = c_str() + (nStart == npos ? Len() : nStart); const wxChar *p = c_str() + (nStart == npos ? Len() : nStart);
@@ -1715,7 +1715,7 @@ size_t wxString::rfind(const wxString& str, size_t nStart) const
#if !defined(__VISUALC__) || defined(__WIN32__) #if !defined(__VISUALC__) || defined(__WIN32__)
size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const size_t wxString::rfind(const wxChar* sz, size_t nStart, size_t n) const
{ {
return rfind(wxString(sz, n == npos ? 0 : n), nStart); return rfind(wxString(sz, n == npos ? wxSTRING_MAXLEN : n), nStart);
} }
size_t wxString::rfind(wxChar ch, size_t nStart) const size_t wxString::rfind(wxChar ch, size_t nStart) const