Added autoconf makefiles for FoldBar extended samples

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

diff --git a/wxPython/src/my_typemaps.i b/wxPython/src/my_typemaps.i
index cd0d21826db66deddd89cd77ba1a8022c576ae0f..b0975a56c2f036c74ccd453ece4694d325bf731c 100644 (file)
--- a/wxPython/src/my_typemaps.i
+++ b/wxPython/src/my_typemaps.i
@@ -14,6 +14,24 @@
 //----------------------------------------------------------------------
 // Typemaps to convert a list of items to an int (size) and an array
 
+%define MAKE_INT_ARRAY_TYPEMAPS(NAME, ARR_NAME)
+    %typemap(in) (int NAME, int* ARR_NAME) {
+        $1 = PyList_Size($input);
+        $2 =  int_LIST_helper($input);
+        if ($2 == NULL) SWIG_fail;
+    }
+
+    %typemap(freearg) (int NAME, int* ARR_NAME) {
+        if ($2) delete [] $2;
+    }
+%enddef
+
+MAKE_INT_ARRAY_TYPEMAPS(widths, widths_field)
+MAKE_INT_ARRAY_TYPEMAPS(styles, styles_field)
+
+    
+
+// Same things for a wxString
 %typemap(in) (int choices, wxString* choices_array ) {
     $1 = PyList_Size($input);
     $2 = wxString_LIST_helper($input);
@@ -24,14 +42,15 @@
 }
 
 
+
 //---------------------------------------------------------------------------
 // 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)
@@ -82,7 +101,7 @@
 //---------------------------------------------------------------------------
 // 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;
@@ -90,7 +109,7 @@
     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);
 }
@@ -172,13 +191,13 @@
 //---------------------------------------------------------------------------
 // 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);
@@ -201,13 +220,13 @@
 //---------------------------------------------------------------------------
 // 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);
@@ -264,60 +283,22 @@
 }
 
 
-// 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;
-    }
+//---------------------------------------------------------------------------
+// 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);
 }
-%}
-
-%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(out) wxFileOffset {
+    if (sizeof(wxFileOffset) > sizeof(long))
+        $result = PyLong_FromLongLong($1);
+    else
+        $result = PyInt_FromLong($1);
 }
-%}
 
 
 //---------------------------------------------------------------------------
@@ -340,6 +321,9 @@ SWIG_AsDouble(PyObject *obj)
 // to the real derived type, if possible.  See wxPyMake_wxObject in
 // helpers.cpp
 
+// 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); }
@@ -349,7 +333,6 @@ SWIG_AsDouble(PyObject *obj)
 %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) wxGridTableBase*          { $result = wxPyMake_wxObject($1, $owner); }
 %typemap(out) wxImageList*              { $result = wxPyMake_wxObject($1, $owner); }
 %typemap(out) wxListItem*               { $result = wxPyMake_wxObject($1, $owner); }
 %typemap(out) wxMenuItem*               { $result = wxPyMake_wxObject($1, $owner); }
@@ -365,7 +348,7 @@ SWIG_AsDouble(PyObject *obj)
 %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) 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); }
@@ -375,12 +358,12 @@ SWIG_AsDouble(PyObject *obj)
 %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) wxTreeCtrl*               { $result = wxPyMake_wxObject($1, $owner); }
 %typemap(out) wxPyTreeCtrl*             { $result = wxPyMake_wxObject($1, $owner); }
 %typemap(out) wxWindow*                 { $result = wxPyMake_wxObject($1, $owner); }
-%typemap(out) wxHtmlWindow*             { $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); }