ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common: Avoid wchar_t in pxTextWrapper 

wchar_t is 16-bits on Windows, which can't actually properly fit all
Unicode characters.

Use the wx3.0.x wxTextWrapper approach of using iterators that increment
by actual characters to fix the issue, and also switch to using the
std::string style functions in wxString.
This commit is contained in:
Jonathan Li 2016-12-10 22:30:27 +00:00
parent afe86a5f66
commit 415090d249
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/src/Utilities/wxGuiTools.cpp
View File

@ -400,21 +400,21 @@ static bool no_break_before(const uint ch)
pxTextWrapperBase &pxTextWrapperBase::Wrap(const wxWindow &win, const wxString &text, int widthMax)
{
if (text.IsEmpty())
if (text.empty())
return *this;
const wxChar *lastSpace = NULL;
bool wasWrapped = false;
wxString line;
line.Alloc(text.Length() + 12);
line.reserve(text.length() + 12);
const wxChar *lineStart = text.wc_str();
for (const wxChar *p = lineStart;; p++) {
wxString::const_iterator lastSpace = text.end();
wxString::const_iterator lineStart = text.begin();
for (wxString::const_iterator p = lineStart;; ++p) {
if (IsStartOfNewLine()) {
OnNewLine();
lastSpace = NULL;
lastSpace = text.end();
lineStart = p;
if (wasWrapped)
@ -423,14 +423,13 @@ pxTextWrapperBase &pxTextWrapperBase::Wrap(const wxWindow &win, const wxString &
line.clear();
}
if (*p == L'\n' || *p == L'\0') {
if (p == text.end() || *p == L'\n') {
wasWrapped = false;
DoOutputLine(line);
if (*p == L'\0')
if (p == text.end())
break;
} else // not EOL
{
} else { // not EOL
if (is_cjk_char(*p)) {
if (!no_break_before(*p)) {
if (p == lineStart || !no_break_after(*(p - 1)))
@ -441,7 +440,7 @@ pxTextWrapperBase &pxTextWrapperBase::Wrap(const wxWindow &win, const wxString &
line += *p;
if (widthMax >= 0 && lastSpace) {
if (widthMax >= 0 && lastSpace != text.end()) {
int width;
win.GetTextExtent(line, &width, NULL);