AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Robin Dunn 2005-05-09 18:55:18 +00:00
parent da78f3b10c
commit 9899bd5bc7
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wxPython/docs/CHANGES.txt
View File

@ -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.

10
wxPython/src/my_typemaps.i
View File

@ -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);
}
}