X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f3c2a60b95314cc134b33f769f39937cf1a34ea0..0a5bb138a71dfc1c706fc0858fb2801500e2c2e8:/wxPython/src/my_typemaps.i

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 4e9707a3b1..958ac1eac5 100644
--- 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"
@@ -191,8 +203,6 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
     $1 = wxColour_typecheck($input);
 }
 
-
-
 //---------------------------------------------------------------------------
 // Typemap for wxArrayString from Python sequence objects
 
@@ -206,15 +216,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);
     }
 }
 
@@ -236,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);
@@ -249,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);
 }
 
 
@@ -321,6 +349,26 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 }
 
 
+//---------------------------------------------------------------------------
+// Typemaps for loading a image or bitmap from an object that implements the
+// buffer interface
+
+%typemap(in) (buffer data, int DATASIZE) (Py_ssize_t temp)
+{
+    if (PyObject_AsReadBuffer($input, (const void**)(&$1), &temp) == -1) SWIG_fail;
+    $2 = (int)temp;
+}
+
+%typemap(in) (buffer alpha, int ALPHASIZE) (Py_ssize_t temp)
+{
+    if ($input != Py_None) {
+        if (PyObject_AsReadBuffer($input, (const void**)(&$1), &temp) == -1) SWIG_fail;
+        $2 = (int)temp;
+    }
+}
+
+
+
 //---------------------------------------------------------------------------
 // Typemaps to convert return values that are base class pointers
 // to the real derived type, if possible.  See wxPyMake_wxObject in
@@ -329,52 +377,51 @@ MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
 // NOTE: For those classes that also call _setOORInfo these typemaps should be
 // disabled for the constructor.
 
-%typemap(out) wxEvtHandler*             { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxMenu*                   { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxValidator*              { $result = wxPyMake_wxObject($1, $owner); }
-
-%typemap(out) wxApp*                    { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxPyApp*                  { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxDC*                     { $result = wxPyMake_wxObject($1, $owner); }
-%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); }
-%typemap(out) wxObject*                 { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxPyPrintout*             { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxToolBarToolBase*        { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxToolTip*                { $result = wxPyMake_wxObject($1, $owner); }
-
-
-%typemap(out) wxBitmapButton*           { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxButton*                 { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxControl*                { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxFrame*                  { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxGrid*                   { $result = wxPyMake_wxObject($1, $owner); }
-//%typemap(out) wxListCtrl*               { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxMDIChildFrame*          { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxMDIClientWindow*        { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxMenuBar*                { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxNotebook*               { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxStaticBox*              { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxStatusBar*              { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxTextCtrl*               { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxToolBar*                { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxToolBarBase*            { $result = wxPyMake_wxObject($1, $owner); }
-//%typemap(out) wxTreeCtrl*               { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxPyTreeCtrl*             { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxWindow*                 { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxPyHtmlWindow*           { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxWizardPage*             { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxPyWizardPage*           { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxPanel*                  { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxDialog*                 { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxScrolledWindow*         { $result = wxPyMake_wxObject($1, $owner); }
-
-%typemap(out) wxSizer*                  { $result = wxPyMake_wxObject($1, $owner); }
+%typemap(out) wxEvtHandler*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMenu*                   { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxValidator*              { $result = wxPyMake_wxObject($1, (bool)$owner); }
+
+%typemap(out) wxApp*                    { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyApp*                  { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxDC*                     { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxFSFile*                 { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxFileSystem*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxImageList*              { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxImage*                  { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxListItem*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMenuItem*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxMouseEvent*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxObject*                 { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyPrintout*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxToolBarToolBase*        { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxToolTip*                { $result = wxPyMake_wxObject($1, (bool)$owner); }
+
+
+%typemap(out) wxBitmapButton*           { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxButton*                 { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%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) 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); }
+%typemap(out) wxNotebook*               { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxStaticBox*              { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxStatusBar*              { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%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) 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); }
+%typemap(out) wxWizardPage*             { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPyWizardPage*           { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxPanel*                  { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxDialog*                 { $result = wxPyMake_wxObject($1, (bool)$owner); }
+%typemap(out) wxScrolledWindow*         { $result = wxPyMake_wxObject($1, (bool)$owner); }
+
+%typemap(out) wxSizer*                  { $result = wxPyMake_wxObject($1, (bool)$owner); }
 
 
 //---------------------------------------------------------------------------