This commit was manufactured by cvs2svn to create tag 'WX_2_4_0'.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/WX_2_4_0@18627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/contrib/dllwidget/dllwidget.py

@@ -1,5 +1,5 @@
 # The SWIG module is named dllwidget_ to avoid name clashes, so
-# this stub just imports everything in it so the firendly module
+# this stub just imports everything in it so the friendly module
 # name can be used elsewhere.
 
 from dllwidget_ import *

wxPython/contrib/dllwidget/dllwidget_.cpp

@@ -314,7 +314,7 @@ static PyObject *_wrap_wxDllWidget_GetDllExt(PyObject *self, PyObject *args, PyO
     if (PyErr_Occurred()) return NULL;
 }{
 #if wxUSE_UNICODE
-    _resultobj = PyUnicode_FromUnicode(_result->c_str(), _result->Len());
+    _resultobj = PyUnicode_FromWideChar(_result->c_str(), _result->Len());
 #else
     _resultobj = PyString_FromStringAndSize(_result->c_str(), _result->Len());
 #endif