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

changed wxString::StartsWidth/EndsWidth to take wxString argument instead of wxChar*

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45922 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2007-05-09 21:07:08 +00:00
parent ff0846a09f
commit c5e7a7d769
3 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/latex/wx/wxstring.tex
View File

@ -1110,7 +1110,7 @@ Minimizes the string's memory. This can be useful after a call to
\membersection{wxString::StartsWith}\label{wxstringstartswith}
\constfunc{bool}{StartsWith}{\param{const wxChar }{*prefix}, \param{wxString }{*rest = NULL}}
\constfunc{bool}{StartsWith}{\param{const wxString\& }{prefix}, \param{wxString }{*rest = NULL}}
This function can be used to test if the string starts with the specified
{\it prefix}. If it does, the function will return \true and put the rest
@ -1121,7 +1121,7 @@ of the string (i.e. after the prefix) into {\it rest} string if it is not
\membersection{wxString::EndsWith}\label{wxstringendswith}
\constfunc{bool}{EndsWith}{\param{const wxChar }{*suffix}, \param{wxString }{*rest = NULL}}
\constfunc{bool}{EndsWith}{\param{const wxString\& }{suffix}, \param{wxString }{*rest = NULL}}
This function can be used to test if the string ends with the specified
{\it suffix}. If it does, the function will return \true and put the

4
include/wx/string.h
View File

@ -1464,11 +1464,11 @@ public:
// check if the string starts with the given prefix and return the rest
// of the string in the provided pointer if it is not NULL; otherwise
// return false
bool StartsWith(const wxChar *prefix, wxString *rest = NULL) const;
bool StartsWith(const wxString& prefix, wxString *rest = NULL) const;
// check if the string ends with the given suffix and return the
// beginning of the string before the suffix in the provided pointer if
// it is not NULL; otherwise return false
bool EndsWith(const wxChar *suffix, wxString *rest = NULL) const;
bool EndsWith(const wxString& suffix, wxString *rest = NULL) const;
// get first nCount characters
wxString Left(size_t nCount) const;

25
src/common/string.cpp
View File

@ -1065,28 +1065,15 @@ wxString wxString::Mid(size_t nFirst, size_t nCount) const
// check that the string starts with prefix and return the rest of the string
// in the provided pointer if it is not NULL, otherwise return false
bool wxString::StartsWith(const wxChar *prefix, wxString *rest) const
bool wxString::StartsWith(const wxString& prefix, wxString *rest) const
{
wxASSERT_MSG( prefix, _T("invalid parameter in wxString::StartsWith") );
// first check if the beginning of the string matches the prefix: note
// that we don't have to check that we don't run out of this string as
// when we reach the terminating NUL, either prefix string ends too (and
// then it's ok) or we break out of the loop because there is no match
const wxChar *p = c_str();
while ( *prefix )
{
if ( *prefix++ != *p++ )
{
// no match
if ( compare(0, prefix.length(), prefix) != 0 )
return false;
}
}
if ( rest )
{
// put the rest of the string into provided pointer
*rest = p;
rest->assign(*this, prefix.length(), npos);
}
return true;
@ -1095,11 +1082,9 @@ bool wxString::StartsWith(const wxChar *prefix, wxString *rest) const
// check that the string ends with suffix and return the rest of it in the
// provided pointer if it is not NULL, otherwise return false
bool wxString::EndsWith(const wxChar *suffix, wxString *rest) const
bool wxString::EndsWith(const wxString& suffix, wxString *rest) const
{
wxASSERT_MSG( suffix, _T("invalid parameter in wxString::EndssWith") );
int start = length() - wxStrlen(suffix);
int start = length() - suffix.length();
if ( start < 0 || compare(start, npos, suffix) != 0 )
return false;