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

UTF-8 build fixes for appending, setting or searching for NUL characters

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51411 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2008-01-27 16:29:52 +00:00
parent 4f03ec887b
commit 84d2877f32
1 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
include/wx/string.h
View File

@@ -1343,7 +1343,15 @@ public:
{ return *this = cstr.AsString(); } { return *this = cstr.AsString(); }
// from a character // from a character
wxString& operator=(wxUniChar ch) wxString& operator=(wxUniChar ch)
{ m_impl = wxStringOperations::EncodeChar(ch); return *this; } {
#if wxUSE_UNICODE_UTF8
if ( !ch.IsAscii() )
m_impl = wxStringOperations::EncodeChar(ch);
else
#endif
m_impl = (wxStringCharType)ch;
return *this;
}
wxString& operator=(wxUniCharRef ch) wxString& operator=(wxUniCharRef ch)
{ return operator=((wxUniChar)ch); } { return operator=((wxUniChar)ch); }
wxString& operator=(char ch) wxString& operator=(char ch)
@@ -2242,8 +2250,15 @@ public:
// find the first occurence of character ch after nStart // find the first occurence of character ch after nStart
size_t find(wxUniChar ch, size_t nStart = 0) const size_t find(wxUniChar ch, size_t nStart = 0) const
{ {
#if wxUSE_UNICODE_UTF8
if ( !ch.IsAscii() )
return PosFromImpl(m_impl.find(wxStringOperations::EncodeChar(ch), return PosFromImpl(m_impl.find(wxStringOperations::EncodeChar(ch),
PosToImpl(nStart))); PosToImpl(nStart)));
else
#endif
return PosFromImpl(m_impl.find((wxStringCharType)ch,
PosToImpl(nStart)));
} }
size_t find(wxUniCharRef ch, size_t nStart = 0) const size_t find(wxUniCharRef ch, size_t nStart = 0) const
{ return find(wxUniChar(ch), nStart); } { return find(wxUniChar(ch), nStart); }
@@ -2280,8 +2295,14 @@ public:
// as find, but from the end // as find, but from the end
size_t rfind(wxUniChar ch, size_t nStart = npos) const size_t rfind(wxUniChar ch, size_t nStart = npos) const
{ {
#if wxUSE_UNICODE_UTF8
if ( !ch.IsAscii() )
return PosFromImpl(m_impl.rfind(wxStringOperations::EncodeChar(ch), return PosFromImpl(m_impl.rfind(wxStringOperations::EncodeChar(ch),
PosToImpl(nStart))); PosToImpl(nStart)));
else
#endif
return PosFromImpl(m_impl.rfind((wxStringCharType)ch,
PosToImpl(nStart)));
} }
size_t rfind(wxUniCharRef ch, size_t nStart = npos) const size_t rfind(wxUniCharRef ch, size_t nStart = npos) const
{ return rfind(wxUniChar(ch), nStart); } { return rfind(wxUniChar(ch), nStart); }
@@ -2519,7 +2540,15 @@ public:
{ return operator+=(s.data()); } { return operator+=(s.data()); }
// string += char // string += char
wxString& operator+=(wxUniChar ch) wxString& operator+=(wxUniChar ch)
{ m_impl += wxStringOperations::EncodeChar(ch); return *this; } {
#if wxUSE_UNICODE_UTF8
if ( !ch.IsAscii() )
m_impl += wxStringOperations::EncodeChar(ch);
else
#endif
m_impl += (wxStringCharType)ch;
return *this;
}
wxString& operator+=(wxUniCharRef ch) { return *this += wxUniChar(ch); } wxString& operator+=(wxUniCharRef ch) { return *this += wxUniChar(ch); }
wxString& operator+=(int ch) { return *this += wxUniChar(ch); } wxString& operator+=(int ch) { return *this += wxUniChar(ch); }
wxString& operator+=(char ch) { return *this += wxUniChar(ch); } wxString& operator+=(char ch) { return *this += wxUniChar(ch); }