Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 03:50:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed 'str' to 'wxString' converstation, when emoji is inside string (fixes #2446)

Browse Source
This commit is contained in:
timrid
2023-11-27 09:59:05 +01:00
committed by GitHub
parent 172e732a0c
commit 0dcd0640ca
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/arrays.sip
View File

@@ -59,7 +59,7 @@
}
PyErr_Clear();
wxString string;
size_t len = PyUnicode_GET_LENGTH(item);
size_t len = PyUnicode_AsWideChar(item, NULL, 0);
if (len) {
wxPyUnicode_AsWideChar(item, wxStringBuffer(string, len), len);
}

2
src/string.sip
View File

@@ -45,7 +45,7 @@
}
}
*sipCppPtr = new wxString();
size_t len = PyUnicode_GET_LENGTH(uni);
size_t len = PyUnicode_AsWideChar(uni, NULL, 0);
if (len) {
wxPyUnicode_AsWideChar(uni, wxStringBuffer(**sipCppPtr, len), len);
}

4
src/wxpy_api.sip
View File

@@ -54,7 +54,7 @@ static wxString i_Py2wxString(PyObject* source)
}
}
wxString target;
size_t len = PyUnicode_GET_LENGTH(uni);
size_t len = PyUnicode_AsWideChar(uni, NULL, 0);
if (len) {
wxPyUnicode_AsWideChar(uni, wxStringBuffer(target, len), len);
}
@@ -84,7 +84,7 @@ static wxString i_Py2wxString(PyObject* source)
// }
// }
// // TODO: Coerce non-unicode types to unicode here? (Classic does)
// size_t len = PyUnicode_GET_LENGTH(uni);
// size_t len = PyUnicode_AsWideChar(uni, NULL, 0);
// if (len) {
// wxPyUnicode_AsWideChar(uni, wxStringBuffer(str, len), len);
// }