Fixed the typemap that converts a Python list of strings to a

wxArrayString so it uses the wxPy default encoding.

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

diff --git a/wxPython/docs/CHANGES.txt b/wxPython/docs/CHANGES.txt
index ec58f828c9e8a00eb379cd15baa0f6f18739afe7..771425a8f54dc1fbd49ad606c7c4c6ab55793d6a 100644 (file)
--- a/wxPython/docs/CHANGES.txt
+++ b/wxPython/docs/CHANGES.txt
@@ -9,7 +9,21 @@ Added wx.BrushFromBitmap to create a stippled brush in a single step.
 Also added missing brysh style flags: wx.STIPPLE_MASK
 wx.STIPPLE_MASK_OPAQUE. 
 
-wxMSW:  Fix for controls when the system text fg colour is not black.
+wxMSW: Fix for controls when the system text fg colour is not black.
+
+wxGTK: Patch #1171754, It is now possible to have a menu item that
+both has an icon and is a submenu.
+
+wxMSW: Patch #1197009, better refreshes when windowa are moved and
+resized. 
+
+wxMSW: Patch #1197468.  Keeps track of pending size/position changes
+in case there is more than one adjustment for a window in a single
+DeferWindowPos set, then the pending values can be used for defaults
+instead of current values.
+
+Fixed the typemap that converts a Python list of strings to a
+wxArrayString so it uses the wxPy default encoding.
 
 
 

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 4e9707a3b11397fb7b5cd0c333420439a3c7cf70..c22b3ae7ef05050294478c7a3bd17a80a4e7d492 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -206,15 +206,11 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
     int i, len=PySequence_Length($input);
     for (i=0; i<len; i++) {
         PyObject* item = PySequence_GetItem($input, i);
-%#if wxUSE_UNICODE
-        PyObject* str  = PyObject_Unicode(item);
-%#else
-        PyObject* str  = PyObject_Str(item);
-%#endif
+        wxString* s = wxString_in_helper(item);
         if (PyErr_Occurred())  SWIG_fail;
-        $1->Add(Py2wxString(str));
+        $1->Add(*s);
+        delete s;
         Py_DECREF(item);
-        Py_DECREF(str);
     }
 }