X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0190c47234148dbbb778fb3150d7a375389dbb8b..dfea7acc199a2d57f444593f69b35181da34a34c:/wxPython/src/my_typemaps.i

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 9e30c677f8..c22b3ae7ef 100644
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -47,10 +47,10 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 // wxString typemaps
 
 
-%typemap(in) wxString& (bool temp=False) {
+%typemap(in) wxString& (bool temp=false) {
     $1 = wxString_in_helper($input);
     if ($1 == NULL) SWIG_fail;
-    temp = True;
+    temp = true;
 }
 %typemap(freearg) wxString& {
     if (temp$argnum)
@@ -101,7 +101,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 //---------------------------------------------------------------------------
 // wxMemoryBuffer  (needed for wxSTC)
 
-%typemap(in) wxMemoryBuffer& (bool temp=False) {
+%typemap(in) wxMemoryBuffer& (bool temp=false) {
     if (!PyString_Check($input)) {
         PyErr_SetString(PyExc_TypeError, "String buffer expected");
         SWIG_fail;
@@ -109,7 +109,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
     char* str = PyString_AS_STRING($input);
     int   len = PyString_GET_SIZE($input);
     $1 = new wxMemoryBuffer(len);
-    temp = True;
+    temp = true;
     memcpy($1->GetData(), str, len);
     $1->SetDataLen(len);
 }
@@ -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.
@@ -191,25 +196,21 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 //---------------------------------------------------------------------------
 // Typemap for wxArrayString from Python sequence objects
 
-%typemap(in) wxArrayString& (bool temp=False) {
+%typemap(in) wxArrayString& (bool temp=false) {
     if (! PySequence_Check($input)) {
         PyErr_SetString(PyExc_TypeError, "Sequence of strings expected.");
         SWIG_fail;
     }
     $1 = new wxArrayString;
-    temp = True;
+    temp = true;
     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);
     }
 }
 
@@ -220,13 +221,13 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 //---------------------------------------------------------------------------
 // Typemap for wxArrayInt from Python sequence objects
 
-%typemap(in) wxArrayInt& (bool temp=False) {
+%typemap(in) wxArrayInt& (bool temp=false) {
     if (! PySequence_Check($input)) {
         PyErr_SetString(PyExc_TypeError, "Sequence of integers expected.");
         SWIG_fail;
     }
     $1 = new wxArrayInt;
-    temp = True;
+    temp = true;
     int i, len=PySequence_Length($input);
     for (i=0; i<len; i++) {
         PyObject* item = PySequence_GetItem($input, i);
@@ -283,6 +284,24 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 }
 
 
+//---------------------------------------------------------------------------
+// wxFileOffset, can be a 32-bit or a 64-bit integer
+
+%typemap(in) wxFileOffset {
+    if (sizeof(wxFileOffset) > sizeof(long))
+        $1 = PyLong_AsLongLong($input);
+    else
+        $1 = PyInt_AsLong($input);
+}
+
+%typemap(out) wxFileOffset {
+    if (sizeof(wxFileOffset) > sizeof(long))
+        $result = PyLong_FromLongLong($1);
+    else
+        $result = PyInt_FromLong($1);
+}
+
+
 //---------------------------------------------------------------------------
 // Typemap for when GDI objects are returned by reference.  This will cause a
 // copy to be made instead of returning a reference to the same instance.  The
@@ -316,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); }
@@ -350,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); }
 
 
 //---------------------------------------------------------------------------