X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/87c2245b34abf6898c8e558bc7674c485c709a68..a1ae1090eebbc49d8495c3d3464457277af846db:/wxPython/src/my_typemaps.i

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index 8e5898332d..d9b078bc4e 100644
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -35,8 +35,6 @@
 }
 
 
-
-
 //---------------------------------------------------------------------------
 // wxString typemaps
 
@@ -51,18 +49,7 @@
         delete $1;
 }
 
-
-
-%typemap(out) wxString {
-%#if wxUSE_UNICODE
-    $result = PyUnicode_FromWideChar($1.c_str(), $1.Len());
-%#else
-    $result = PyString_FromStringAndSize($1.c_str(), $1.Len());
-%#endif
-}
-
-
-%typemap(out) wxString* {
+%typemap(out) wxString& {
 %#if wxUSE_UNICODE
     $result = PyUnicode_FromWideChar($1->c_str(), $1->Len());
 %#else
@@ -71,15 +58,18 @@
 }
 
 
-%typemap(out) wxString& {
+%apply wxString& { wxString* }
+
+
+
+%typemap(out) wxString {
 %#if wxUSE_UNICODE
-    $result = PyUnicode_FromWideChar($1->c_str(), $1->Len());
+    $result = PyUnicode_FromWideChar($1.c_str(), $1.Len());
 %#else
-    $result = PyString_FromStringAndSize($1->c_str(), $1->Len());
+    $result = PyString_FromStringAndSize($1.c_str(), $1.Len());
 %#endif
 }
 
-
 %typemap(varout) wxString {
 %#if wxUSE_UNICODE
     $result = PyUnicode_FromWideChar($1.c_str(), $1.Len());
@@ -95,35 +85,35 @@
     $1 = *sptr;
     delete sptr;
 }
-    
-   
 
-// //---------------------------------------------------------------------------
+%typemap(typecheck, precedence=SWIG_TYPECHECK_POINTER) wxString& {
+    $1 = PyString_Check($input) || PyUnicode_Check($input);
+}
 
+//---------------------------------------------------------------------------
+// wxMemoryBuffer  (needed for wxSTC)
 
-// %typemap(python, in) wxMemoryBuffer& {
-//     if (!PyString_Check($source)) {
-//         PyErr_SetString(PyExc_TypeError, "String buffer expected");
-//         return NULL;
-//     }
-//     char* str = PyString_AS_STRING($source);
-//     int   len = PyString_GET_SIZE($source);
-//     $target = new wxMemoryBuffer(len);
-//     memcpy($target->GetData(), str, len);
-// }
+%typemap(in) wxMemoryBuffer& (bool temp=False) {
+    if (!PyString_Check($input)) {
+        PyErr_SetString(PyExc_TypeError, "String buffer expected");
+        SWIG_fail;
+    }
+    char* str = PyString_AS_STRING($input);
+    int   len = PyString_GET_SIZE($input);
+    $1 = new wxMemoryBuffer(len);
+    temp = True;
+    memcpy($1->GetData(), str, len);
+    $1->SetDataLen(len);
+}
 
-// %typemap(python, freearg) wxMemoryBuffer& {
-//     if ($target)
-//         delete $source;
-// }
+%typemap(freearg) wxMemoryBuffer& {
+    if (temp$argnum) delete $1;
+}
 
-// %typemap(python, out) wxMemoryBuffer {
-//     $target = PyString_FromStringAndSize((char*)$source->GetData(), $source->GetDataLen());
-// }
+%typemap(out) wxMemoryBuffer {
+    $result = PyString_FromStringAndSize((char*)$1.GetData(), $1.GetDataLen());
+}
 
-// %typemap(python, ret) wxMemoryBuffer {
-//     delete $source;
-// }
 
 
 //---------------------------------------------------------------------------
@@ -193,12 +183,13 @@
 //---------------------------------------------------------------------------
 // Typemap for wxArrayString from Python sequence objects
 
-%typemap(in) wxArrayString& {
+%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;
     int i, len=PySequence_Length($input);
     for (i=0; i<len; i++) {
         PyObject* item = PySequence_GetItem($input, i);
@@ -207,6 +198,7 @@
 %#else
         PyObject* str  = PyObject_Str(item);
 %#endif
+        if (PyErr_Occurred())  SWIG_fail;
         $1->Add(Py2wxString(str));
         Py_DECREF(item);
         Py_DECREF(str);
@@ -214,18 +206,19 @@
 }
 
 %typemap(freearg) wxArrayString& {
-    if ($1) delete $1;
+    if (temp$argnum) delete $1;
 }
 
 //---------------------------------------------------------------------------
 // Typemap for wxArrayInt from Python sequence objects
 
-%typemap(in) wxArrayInt& {
+%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;
     int i, len=PySequence_Length($input);
     for (i=0; i<len; i++) {
         PyObject* item = PySequence_GetItem($input, i);
@@ -237,7 +230,7 @@
 }
 
 %typemap(freearg) wxArrayInt& {
-    if ($1) delete $1;
+    if (temp$argnum) delete $1;
 }
 
 
@@ -275,61 +268,82 @@
 }
 
 
-// //---------------------------------------------------------------------------
-// // Map T_OUTPUTs for floats to return ints.
-
-
-// %typemap(python,ignore) float          *T_OUTPUT_TOINT(float temp),
-//                         double         *T_OUTPUT_TOINT(double temp)
-// {
-//   $target = &temp;
-// }
-
-
-// %typemap(python,argout) float          *T_OUTPUT_TOINT,
-//                         double         *T_OUTPUT_TOINT
-// {
-//     PyObject *o;
-//     o = PyInt_FromLong((long) (*$source));
-//     $target = t_output_helper($target, o);
-// }
-
-
-// %typemap(python,ignore) bool *T_OUTPUT(int temp)
-// {
-//   $target = (bool*)&temp;
-// }
-
-// %typemap(python,argout) bool *T_OUTPUT
-// {
-//     PyObject *o;
-//     o = PyInt_FromLong((long) (*$source));
-//     $target = t_output_helper($target, o);
-// }
-
-// %typemap(python,ignore) bool  *OUTPUT = bool *T_OUTPUT;
-// %typemap(python,argout) bool  *OUTPUT = bool *T_OUTPUT;
+//---------------------------------------------------------------------------
 
+%typemap(out) bool {
+    $result = $1 ? Py_True : Py_False; Py_INCREF($result);
+}
 
 
-// %typemap(python,ignore) byte *T_OUTPUT(int temp)
-// {
-//   $target = (byte*)&temp;
-// }
+// These fragments are iserted in modules that need to convert PyObjects to
+// integer values, my versions allow any numeric type to be used, as long as
+// it can be converted to a PyInt.  (Specifically, I allow floats where the
+// default SWIG_AsLong would raise an obsucre exception from within
+// PyLong_AsLong.)
+
+%fragment("SWIG_AsLong","header") %{
+SWIGSTATICINLINE(long)
+SWIG_AsLong(PyObject * obj)
+{
+    if (PyNumber_Check(obj))
+        return PyInt_AsLong(obj);
+    else {
+        PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
+                                               obj->ob_type->tp_name);
+        PyErr_SetObject(PyExc_TypeError, errmsg);
+        Py_DECREF(errmsg);
+        return 0;
+    }
+}
+%}
+
+%fragment("SWIG_AsUnsignedLong","header", fragment="SWIG_AsLong") %{
+SWIGSTATICINLINE(unsigned long)
+SWIG_AsUnsignedLong(PyObject * obj) 
+{
+  if (PyLong_Check(obj)) {
+    return PyLong_AsUnsignedLong(obj);
+  } else {
+    long i = SWIG_AsLong(obj);
+    if ( !PyErr_Occurred() && (i < 0)) {
+      PyErr_SetString(PyExc_TypeError, "negative value received for unsigned type");
+    }
+    return i;
+  }
+}
+%}
+
+
+%fragment("SWIG_AsDouble","header") %{
+SWIGSTATICINLINE(double)
+SWIG_AsDouble(PyObject *obj)
+{
+    if (PyNumber_Check(obj))
+        return PyFloat_AsDouble(obj);
+    else {
+        PyObject* errmsg = PyString_FromFormat("Expected number, got %s",
+                                               obj->ob_type->tp_name);
+        PyErr_SetObject(PyExc_TypeError, errmsg);
+        Py_DECREF(errmsg);
+        return 0;
+    }
+}
+%}
 
-// %typemap(python,argout) byte *T_OUTPUT
-// {
-//     PyObject *o;
-//     o = PyInt_FromLong((long) (*$source));
-//     $target = t_output_helper($target, o);
-// }
 
-// %typemap(python,ignore) byte  *OUTPUT = byte *T_OUTPUT;
-// %typemap(python,argout) byte  *OUTPUT = byte *T_OUTPUT;
+//---------------------------------------------------------------------------
+// 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
+// GDI object's internal refcounting scheme will do a copy-on-write of the
+// internal data as needed.
 
+// These too?
+//, wxRegion&, wxPalette&
 
-// %typemap(python,ignore) wxCoord *OUTPUT = int *OUTPUT;
-// %typemap(python,argout) wxCoord *OUTPUT = int *OUTPUT;
+%typemap(out) wxBrush&, wxPen&, wxFont&, wxBitmap&, wxIcon&, wxCursor& {
+    $*1_ltype* resultptr = new $*1_ltype(*$1);
+    $result = SWIG_NewPointerObj((void*)(resultptr), $1_descriptor, 1);
+}
 
 
 //---------------------------------------------------------------------------
@@ -373,10 +387,13 @@
 %typemap(out) wxToolBar*                { $result = wxPyMake_wxObject($1); }
 %typemap(out) wxToolBarBase*            { $result = wxPyMake_wxObject($1); }
 %typemap(out) wxTreeCtrl*               { $result = wxPyMake_wxObject($1); }
+%typemap(out) wxPyTreeCtrl*             { $result = wxPyMake_wxObject($1); }
 %typemap(out) wxWindow*                 { $result = wxPyMake_wxObject($1); }
 %typemap(out) wxHtmlWindow*             { $result = wxPyMake_wxObject($1); }
 %typemap(out) wxPyHtmlWindow*           { $result = wxPyMake_wxObject($1); }
 %typemap(out) wxWizardPage*             { $result = wxPyMake_wxObject($1); }
+%typemap(out) wxPanel*                  { $result = wxPyMake_wxObject($1); }
+%typemap(out) wxDialog*                 { $result = wxPyMake_wxObject($1); }
 
 %typemap(out) wxSizer*                  { $result = wxPyMake_wxSizer($1); }