// ---------------------------------------------------------------------------
/* static */
-wxUniChar::value_type wxUniChar::From8bit(char c)
+wxUniChar::value_type wxUniChar::FromHi8bit(char c)
{
- // all supported charsets have the first 128 characters same as ASCII:
- if ( (unsigned char)c < 0x80 )
- return c;
-
#if wxUSE_UTF8_LOCALE_ONLY
wxFAIL_MSG( "invalid UTF-8 character" );
+ wxUnusedVar(c);
+
return wxT('?'); // FIXME-UTF8: what to use as failure character?
#else
- wchar_t buf[2];
- if ( wxConvLibc.ToWChar(buf, 2, &c, 1) != 2 )
+ char cbuf[2];
+ cbuf[0] = c;
+ cbuf[1] = '\0';
+ wchar_t wbuf[2];
+ if ( wxConvLibc.ToWChar(wbuf, 2, cbuf, 2) != 2 )
{
wxFAIL_MSG( "invalid multibyte character" );
return wxT('?'); // FIXME-UTF8: what to use as failure character?
}
- return buf[0];
+ return wbuf[0];
#endif
}
/* static */
-char wxUniChar::To8bit(wxUniChar::value_type c)
+char wxUniChar::ToHi8bit(wxUniChar::value_type c)
{
- // all supported charsets have the first 128 characters same as ASCII:
- if ( c < 0x80 )
- return c;
-
#if wxUSE_UTF8_LOCALE_ONLY
wxFAIL_MSG( "character cannot be converted to single UTF-8 byte" );
+ wxUnusedVar(c);
+
return '?'; // FIXME-UTF8: what to use as failure character?
#else
- wchar_t in = c;
- char buf[2];
- if ( wxConvLibc.FromWChar(buf, 2, &in, 1) != 2 )
+ wchar_t wbuf[2];
+ wbuf[0] = c;
+ wbuf[1] = L'\0';
+ char cbuf[2];
+ if ( wxConvLibc.FromWChar(cbuf, 2, wbuf, 2) != 2 )
{
wxFAIL_MSG( "character cannot be converted to single byte" );
return '?'; // FIXME-UTF8: what to use as failure character?
}
- return buf[0];
+ return cbuf[0];
#endif
}
for ( size_t i = 0; i < lenNew; ++i, ++pos )
*pos = utf[i];
}
- else
+ else // length of character encoding in UTF-8 changed
{
// the worse case is when the new value has either longer or shorter
// code -- in that case, we have to use wxStringImpl::replace() and
// this invalidates all iterators, so we have to update them too:
- wxString& str = *wx_const_cast(wxString*, m_node.m_str);
- wxStringImpl& strimpl = str.m_impl;
+ wxStringImpl& strimpl = m_str.m_impl;
int iterDiff = lenNew - lenOld;
size_t posIdx = m_pos - strimpl.begin();
size_t *indexes = indexes_a;
size_t iterNum = 0;
wxStringIteratorNode *it;
- for ( it = str.m_iterators.ptr; it; it = it->m_next, ++iterNum )
+ for ( it = m_str.m_iterators.ptr; it; it = it->m_next, ++iterNum )
{
wxASSERT( it->m_iter || it->m_citer );
if ( iterNum == STATIC_SIZE )
{
- wxLogTrace( _T("utf8"), _T("unexpectedly many iterators") );
+ wxLogTrace( wxT("utf8"), wxT("unexpectedly many iterators") );
size_t total = iterNum + 1;
for ( wxStringIteratorNode *it2 = it; it2; it2 = it2->m_next )
// update the string:
strimpl.replace(m_pos, m_pos + lenOld, utf, lenNew);
+#if wxUSE_STRING_POS_CACHE
+ m_str.InvalidateCache();
+#endif // wxUSE_STRING_POS_CACHE
+
// finally, set the iterators to valid values again (note that this
// updates m_pos as well):
size_t i;
- for ( i = 0, it = str.m_iterators.ptr; it; it = it->m_next, ++i )
+ for ( i = 0, it = m_str.m_iterators.ptr; it; it = it->m_next, ++i )
{
wxASSERT( i < iterNum );
wxASSERT( it->m_iter || it->m_citer );