GetDefaultAttributes, and other tweaks needed to get up to date with CVS

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

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index cb5ae174e5a997ee288a69ad15ea7da8fa994aac..78ea572224b99d683a288bf27ea384b3eced6d27 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -90,7 +90,30 @@
     $1 = PyString_Check($input) || PyUnicode_Check($input);
 }
 
-   
+//---------------------------------------------------------------------------
+// wxMemoryBuffer  (needed for wxSTC)
+
+%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);
+}
+
+%typemap(freearg) wxMemoryBuffer& {
+    if (temp$argnum) delete $1;
+}
+
+%typemap(out) wxMemoryBuffer {
+    $result = PyString_FromStringAndSize((char*)$1.GetData(), $1.GetDataLen());
+}
+
+
 
 //---------------------------------------------------------------------------
 // Typemaps to convert Python sequence objects (tuples, etc.) to
@@ -159,12 +182,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);
@@ -180,18 +204,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);
@@ -203,7 +228,7 @@
 }
 
 %typemap(freearg) wxArrayInt& {
-    if ($1) delete $1;
+    if (temp$argnum) delete $1;
 }
 
 
@@ -243,7 +268,80 @@
 
 //---------------------------------------------------------------------------
 
-%typemap(out) bool "$result = $1 ? Py_True : Py_False; Py_INCREF($result);"
+%typemap(out) bool {
+    $result = $1 ? Py_True : Py_False; Py_INCREF($result);
+}
+
+
+// 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 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(out) wxBrush&, wxPen&, wxFont&, wxBitmap&, wxIcon&, wxCursor& {
+    $*1_ltype* resultptr = new $*1_ltype(*$1);
+    $result = SWIG_NewPointerObj((void*)(resultptr), $1_descriptor, 1);
+}
 
 
 //---------------------------------------------------------------------------