No animate contrib anymore

[wxWidgets.git] / wxPython / src / my_typemaps.i

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 70cca8ce18f6103439a27b8ef801488b04d64333..958ac1eac5bd1fb058930185d4f3ad5858e2f5a2 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -125,7 +125,10 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 
 
 %typemap(out) wxCharBuffer {
-    $result = PyString_FromString((char*)$1.data());
+    if ($1.data())
+        $result = PyString_FromString((char*)$1.data());
+    else
+        $result = PyString_FromString("");
 }
 
 
@@ -179,6 +182,15 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 }
 
 
+%typemap(in) wxRect2D& (wxRect2D temp) {
+    $1 = &temp;
+    if ( ! wxRect2D_helper($input, &$1)) SWIG_fail;
+}
+%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxRect2D& {
+    $1 = wxPySimple_typecheck($input, wxT("wxRect2D"), 4);
+}
+
+
 //---------------------------------------------------------------------------
 // Typemap to convert strings to wxColour.  Two string formats are accepted,
 // either a colour name, or a hex colour spec like "#RRGGBB"
@@ -230,6 +242,10 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
     for (i=0; i<len; i++) {
         PyObject* item = PySequence_GetItem($input, i);
         PyObject* number  = PyNumber_Int(item);
+        if (!number) {
+            PyErr_SetString(PyExc_TypeError, "Sequence of integers expected.");
+            SWIG_fail;
+        }       
         $1->Add(PyInt_AS_LONG(number));
         Py_DECREF(item);
         Py_DECREF(number);
@@ -243,24 +259,42 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 
 //---------------------------------------------------------------------------
 // Typemaps to convert an array of ints to a list for return values
+// %typemap(out) wxArrayInt& {
+//     $result = PyList_New(0);
+//     size_t idx;
+//     for (idx = 0; idx < $1->GetCount(); idx += 1) {
+//         PyObject* val = PyInt_FromLong( $1->Item(idx) );
+//         PyList_Append($result, val);
+//         Py_DECREF(val);
+//     }
+// }
+
+// %typemap(out) wxArrayInt {
+//     $result = PyList_New(0);
+//     size_t idx;
+//     for (idx = 0; idx < $1.GetCount(); idx += 1) {
+//         PyObject* val = PyInt_FromLong( $1.Item(idx) );
+//         PyList_Append($result, val);
+//         Py_DECREF(val);
+//     }
+// }
+
 %typemap(out) wxArrayInt& {
-    $result = PyList_New(0);
-    size_t idx;
-    for (idx = 0; idx < $1->GetCount(); idx += 1) {
-        PyObject* val = PyInt_FromLong( $1->Item(idx) );
-        PyList_Append($result, val);
-        Py_DECREF(val);
-    }
+    $result = wxArrayInt2PyList_helper(*$1);
 }
 
 %typemap(out) wxArrayInt {
-    $result = PyList_New(0);
-    size_t idx;
-    for (idx = 0; idx < $1.GetCount(); idx += 1) {
-        PyObject* val = PyInt_FromLong( $1.Item(idx) );
-        PyList_Append($result, val);
-        Py_DECREF(val);
-    }
+    $result = wxArrayInt2PyList_helper($1);
+}
+
+
+// convert array of doubles to a Python list
+%typemap(out) wxArrayDouble& {
+    $result = wxArrayDouble2PyList_helper(*$1);
+}
+
+%typemap(out) wxArrayDouble {
+    $result = wxArrayDouble2PyList_helper($1);
 }
 
 
@@ -368,7 +402,7 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 %typemap(out) wxControl*                { $result = wxPyMake_wxObject($1, (bool)$owner); }
 %typemap(out) wxFrame*                  { $result = wxPyMake_wxObject($1, (bool)$owner); }
 %typemap(out) wxGrid*                   { $result = wxPyMake_wxObject($1, (bool)$owner); }
-//%typemap(out) wxListCtrl*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyListCtrl*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
 %typemap(out) wxMDIChildFrame*          { $result = wxPyMake_wxObject($1, (bool)$owner); }
 %typemap(out) wxMDIClientWindow*        { $result = wxPyMake_wxObject($1, (bool)$owner); }
 %typemap(out) wxMenuBar*                { $result = wxPyMake_wxObject($1, (bool)$owner); }
@@ -378,7 +412,6 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 %typemap(out) wxTextCtrl*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
 %typemap(out) wxToolBar*                { $result = wxPyMake_wxObject($1, (bool)$owner); }
 %typemap(out) wxToolBarBase*            { $result = wxPyMake_wxObject($1, (bool)$owner); }
-//%typemap(out) wxTreeCtrl*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
 %typemap(out) wxPyTreeCtrl*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
 %typemap(out) wxWindow*                 { $result = wxPyMake_wxObject($1, (bool)$owner); }
 %typemap(out) wxPyHtmlWindow*           { $result = wxPyMake_wxObject($1, (bool)$owner); }