moved primitive string and string iterators operations to stringops.h/cpp files to make wxString code easier to read

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-04-19 10:05:55 +00:00
parent e7308074d8
commit 467175ab3f
16 changed files with 654 additions and 533 deletions

View File

@@ -24,9 +24,7 @@
#endif
#include "wx/unichar.h"
// FIXME-UTF8: remove once UTF-8 functions moved outside
#include "wx/string.h"
#include "wx/stringops.h"
// ===========================================================================
// implementation
@@ -69,11 +67,16 @@ char wxUniChar::To8bit(wxUniChar::value_type c)
// ---------------------------------------------------------------------------
#if wxUSE_UNICODE_UTF8
wxUniChar wxUniCharRef::UniChar() const
{
return wxStringOperations::DecodeChar(m_pos);
}
wxUniCharRef& wxUniCharRef::operator=(const wxUniChar& c)
{
wxString::Utf8CharBuffer utf(wxString::EncodeChar(c));
size_t lenOld = wxString::GetUtf8CharLength(*m_pos);
size_t lenNew = wxString::GetUtf8CharLength(utf[0]);
wxStringOperations::Utf8CharBuffer utf(wxStringOperations::EncodeChar(c));
size_t lenOld = wxStringOperations::GetUtf8CharLength(*m_pos);
size_t lenNew = wxStringOperations::GetUtf8CharLength(utf[0]);
if ( lenNew == lenOld )
{