X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/96e5ef7631307ebd9b0e4c51ceaeb68e36569f56..98672b4b9cb156c624a66efd5b3c1935a1d37de9:/wxPython/src/wx.i diff --git a/wxPython/src/wx.i b/wxPython/src/wx.i index 05a1360777..7497d86703 100644 --- a/wxPython/src/wx.i +++ b/wxPython/src/wx.i @@ -12,15 +12,10 @@ %module wx - %{ #include "helpers.h" %} -// %pragma(python) code=" -// # This gives this module's dictionary to the C++ extension code... -// wxc._wxSetDictionary(vars()) -// " //---------------------------------------------------------------------- // This is where we include the other wrapper definition files for SWIG @@ -176,6 +171,10 @@ static wxPyCoreAPI API = { wxPyConstructObject, wxPy_ConvertList, + wxString_in_helper, + Py2wxString, + wx2PyString, + byte_LIST_helper, int_LIST_helper, long_LIST_helper, @@ -250,7 +249,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 %}