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

fix/workaround for Trim() and accented letters

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9080 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-01-11 21:51:16 +00:00
parent 99ba739f6a
commit 576c608dac
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/string.cpp
View File

@@ -986,14 +986,22 @@ wxString& wxString::MakeLower()
// trimming and padding // trimming and padding
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
// some compilers (VC++ 6.0 not to name them) return TRUE for a call to
// isspace('<27>') in the C locale which seems to be broken to me, but we have to
// live with this by checking that the character is a 7 bit one - even if this
// may fail to detect some spaces (I don't know if Unicode doesn't have
// space-like symbols somewhere except in the first 128 chars), it is arguably
// still better than trimming away accented letters
inline int wxSafeIsspace(wxChar ch) { return (ch < 127) && wxIsspace(ch); }
// trims spaces (in the sense of isspace) from left or right side // trims spaces (in the sense of isspace) from left or right side
wxString& wxString::Trim(bool bFromRight) wxString& wxString::Trim(bool bFromRight)
{ {
// first check if we're going to modify the string at all // first check if we're going to modify the string at all
if ( !IsEmpty() && if ( !IsEmpty() &&
( (
(bFromRight && wxIsspace(GetChar(Len() - 1))) || (bFromRight && wxSafeIsspace(GetChar(Len() - 1))) ||
(!bFromRight && wxIsspace(GetChar(0u))) (!bFromRight && wxSafeIsspace(GetChar(0u)))
) )
) )
{ {
@@ -1004,7 +1012,7 @@ wxString& wxString::Trim(bool bFromRight)
{ {
// find last non-space character // find last non-space character
wxChar *psz = m_pchData + GetStringData()->nDataLength - 1; wxChar *psz = m_pchData + GetStringData()->nDataLength - 1;
while ( wxIsspace(*psz) && (psz >= m_pchData) ) while ( wxSafeIsspace(*psz) && (psz >= m_pchData) )
psz--; psz--;
// truncate at trailing space start // truncate at trailing space start
@@ -1015,7 +1023,7 @@ wxString& wxString::Trim(bool bFromRight)
{ {
// find first non-space character // find first non-space character
const wxChar *psz = m_pchData; const wxChar *psz = m_pchData;
while ( wxIsspace(*psz) ) while ( wxSafeIsspace(*psz) )
psz++; psz++;
// fix up data and length // fix up data and length