Applied and merged patch 486364, which enables wxPython to be built in
unicode mode. There are a number of things still missing in it and not everything is converted correctly... But it now builds and functions properly again in non-unicode mode so this is a good time to check in everything. The previous version of all of wxPython sources is tagged wxPy_B4_UNICODE. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -175,6 +175,7 @@ static wxPyCoreAPI API = {
|
||||
wxPyConstructObject,
|
||||
wxPy_ConvertList,
|
||||
|
||||
wxString_in_helper,
|
||||
byte_LIST_helper,
|
||||
int_LIST_helper,
|
||||
long_LIST_helper,
|
||||
@@ -249,7 +250,12 @@ static wxPyCoreAPI API = {
|
||||
PyDict_SetItemString(d,"wxMINOR_VERSION", PyInt_FromLong((long)wxMINOR_VERSION ));
|
||||
PyDict_SetItemString(d,"wxRELEASE_NUMBER", PyInt_FromLong((long)wxRELEASE_NUMBER ));
|
||||
PyDict_SetItemString(d,"wxVERSION_NUMBER", PyInt_FromLong((long)wxVERSION_NUMBER ));
|
||||
#if wxUSE_UNICODE
|
||||
wxString tempStr(wxVERSION_STRING);
|
||||
PyDict_SetItemString(d,"wxVERSION_STRING", PyUnicode_FromUnicode(tempStr.c_str(), tempStr.Len()));
|
||||
#else
|
||||
PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString(wxVERSION_STRING));
|
||||
#endif
|
||||
|
||||
|
||||
%}
|
||||
|
||||
Reference in New Issue
Block a user