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

Instead of always using the Python default encoding for converting

Browse Source 
string and unicode objects to/from wxStrings.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31022 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-12-15 21:15:28 +00:00
parent e2ac17aa7a
commit 27c9e43cc0
5 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
wxPython/src/helpers.cpp
View File

@@ -78,6 +78,8 @@ wxPyThreadStateArray* wxPyTStates = NULL;
wxMutex* wxPyTMutex = NULL;
#endif
#define DEFAULTENCODING_SIZE 64
static char wxPyDefaultEncoding[DEFAULTENCODING_SIZE] = "ascii";
static PyObject* wxPython_dict = NULL;
static PyObject* wxPyAssertionError = NULL;
@@ -1903,7 +1905,7 @@ wxString* wxString_in_helper(PyObject* source) {
#if wxUSE_UNICODE
PyObject* uni = source;
if (PyString_Check(source)) {
uni = PyUnicode_FromObject(source);
uni = PyUnicode_FromEncodedObject(source, wxPyDefaultEncoding, "strict");
if (PyErr_Occurred()) return NULL;
}
target = new wxString();
@@ -1918,7 +1920,11 @@ wxString* wxString_in_helper(PyObject* source) {
#else
// Convert to a string object if it isn't already, then to wxString
PyObject* str = source;
if (!PyString_Check(source)) {
if (PyUnicode_Check(source)) {
str = PyUnicode_AsEncodedString(source, wxPyDefaultEncoding, "strict");
if (PyErr_Occurred()) return NULL;
}
else if (!PyString_Check(source)) {
str = PyObject_Str(source);
if (PyErr_Occurred()) return NULL;
}
@@ -1943,7 +1949,7 @@ wxString Py2wxString(PyObject* source)
// Convert to a unicode object, if not already, then to a wxString
PyObject* uni = source;
if (!PyUnicode_Check(source)) {
uni = PyUnicode_FromObject(source);
uni = PyUnicode_FromEncodedObject(source, wxPyDefaultEncoding, "strict");
if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear?
}
size_t len = PyUnicode_GET_SIZE(uni);
@@ -1957,7 +1963,11 @@ wxString Py2wxString(PyObject* source)
#else
// Convert to a string object if it isn't already, then to wxString
PyObject* str = source;
if (!PyString_Check(source)) {
if (PyUnicode_Check(source)) {
str = PyUnicode_AsEncodedString(source, wxPyDefaultEncoding, "strict");
if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear?
}
else if (!PyString_Check(source)) {
str = PyObject_Str(source);
if (PyErr_Occurred()) return wxEmptyString; // TODO: should we PyErr_Clear?
}
@@ -1986,6 +1996,17 @@ PyObject* wx2PyString(const wxString& src)
}
void wxSetDefaultPyEncoding(const char* encoding)
{
strncpy(wxPyDefaultEncoding, encoding, DEFAULTENCODING_SIZE);
}
const char* wxGetDefaultPyEncoding()
{
return wxPyDefaultEncoding;
}
//----------------------------------------------------------------------