Core wxPython (non-contrib) now fully works with Unicode!
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14586 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
		| @@ -498,15 +498,13 @@ wxHtmlOpeningStatus wxPyHtmlWindow::OnOpeningURL(wxHtmlURLType type, | ||||
|     wxPyBeginBlockThreads(); | ||||
|     if ((found = wxPyCBH_findCallback(m_myInst, "OnOpeningURL"))) { | ||||
|         PyObject* ro; | ||||
|         ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(is)", type, url.c_str())); | ||||
|         ro = wxPyCBH_callCallbackObj(m_myInst, Py_BuildValue("(iO)", type, wx2PyString(url))); | ||||
|         if (PyString_Check(ro) | ||||
| #if PYTHON_API_VERSION >= 1009 | ||||
|             || PyUnicode_Check(ro) | ||||
| #endif | ||||
|             ) { | ||||
|             PyObject* str = PyObject_Str(ro); | ||||
|             *redirect = PyString_AsString(str); | ||||
|             Py_DECREF(str); | ||||
|             *redirect = Py2wxString(ro); | ||||
|             rval = wxHTML_REDIRECT; | ||||
|         } | ||||
|         else { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user