X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56a52e909411904736e41258c39f306d218d84d5..db679b8c836e69c111cdc31e62cf92cebe4f938f:/wxPython/src/my_typemaps.i

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index b0975a56c2..c22b3ae7ef 100644
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -124,6 +124,11 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 
 
 
+%typemap(out) wxCharBuffer {
+    $result = PyString_FromString((char*)$1.data());
+}
+
+
 //---------------------------------------------------------------------------
 // Typemaps to convert Python sequence objects (tuples, etc.) to
 // wxSize, wxPoint, wxRealPoint, and wxRect.
@@ -201,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);
     }
 }
 
@@ -334,6 +335,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 %typemap(out) wxFSFile*                 { $result = wxPyMake_wxObject($1, $owner); }
 %typemap(out) wxFileSystem*             { $result = wxPyMake_wxObject($1, $owner); }
 %typemap(out) wxImageList*              { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxImage*                  { $result = wxPyMake_wxObject($1, $owner); }
 %typemap(out) wxListItem*               { $result = wxPyMake_wxObject($1, $owner); }
 %typemap(out) wxMenuItem*               { $result = wxPyMake_wxObject($1, $owner); }
 %typemap(out) wxMouseEvent*             { $result = wxPyMake_wxObject($1, $owner); }
@@ -368,7 +370,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 %typemap(out) wxDialog*                 { $result = wxPyMake_wxObject($1, $owner); }
 %typemap(out) wxScrolledWindow*         { $result = wxPyMake_wxObject($1, $owner); }
 
-%typemap(out) wxSizer*                  { $result = wxPyMake_wxSizer($1, $owner); }
+%typemap(out) wxSizer*                  { $result = wxPyMake_wxObject($1, $owner); }
 
 
 //---------------------------------------------------------------------------