Update of /cvsroot/mahogany/M/src/Python
In directory sc8-pr-cvs1:/tmp/cvs-serv11556
Modified Files:
MailFolder.cpp-swig MAppBase.cpp-swig Message.cpp-swig
MObject.cpp-swig MTest.cpp-swig
Log Message:
%nodefault; fixed
Index: MailFolder.cpp-swig
===================================================================
RCS file: /cvsroot/mahogany/M/src/Python/MailFolder.cpp-swig,v
retrieving revision 1.47
retrieving revision 1.48
diff -b -u -2 -r1.47 -r1.48
--- MailFolder.cpp-swig 16 Oct 2003 01:42:42 -0000 1.47
+++ MailFolder.cpp-swig 19 Oct 2003 23:33:54 -0000 1.48
@@ -1502,34 +1502,4 @@
-static PyObject *_wrap_new_MailFolder(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- MailFolder *result;
-
- if(!PyArg_ParseTuple(args,(char *)":new_MailFolder")) goto fail;
- result = (MailFolder *)new MailFolder();
-
- resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_MailFolder, 1);
- return resultobj;
- fail:
- return NULL;
-}
-
-
-static PyObject *_wrap_delete_MailFolder(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- MailFolder *arg1 = (MailFolder *) 0 ;
- PyObject * obj0 = 0 ;
-
- if(!PyArg_ParseTuple(args,(char *)"O:delete_MailFolder",&obj0)) goto fail;
- if ((SWIG_ConvertPtr(obj0,(void **) &arg1,
SWIGTYPE_p_MailFolder,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
- delete arg1;
-
- Py_INCREF(Py_None); resultobj = Py_None;
- return resultobj;
- fail:
- return NULL;
-}
-
-
static PyObject * MailFolder_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
@@ -1712,20 +1682,4 @@
-static PyObject *_wrap_delete_HeaderInfo(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- HeaderInfo *arg1 = (HeaderInfo *) 0 ;
- PyObject * obj0 = 0 ;
-
- if(!PyArg_ParseTuple(args,(char *)"O:delete_HeaderInfo",&obj0)) goto fail;
- if ((SWIG_ConvertPtr(obj0,(void **) &arg1,
SWIGTYPE_p_HeaderInfo,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
- delete arg1;
-
- Py_INCREF(Py_None); resultobj = Py_None;
- return resultobj;
- fail:
- return NULL;
-}
-
-
static PyObject * HeaderInfo_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
@@ -1773,34 +1727,4 @@
-static PyObject *_wrap_new_HeaderInfoList(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- HeaderInfoList *result;
-
- if(!PyArg_ParseTuple(args,(char *)":new_HeaderInfoList")) goto fail;
- result = (HeaderInfoList *)new HeaderInfoList();
-
- resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_HeaderInfoList, 1);
- return resultobj;
- fail:
- return NULL;
-}
-
-
-static PyObject *_wrap_delete_HeaderInfoList(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- HeaderInfoList *arg1 = (HeaderInfoList *) 0 ;
- PyObject * obj0 = 0 ;
-
- if(!PyArg_ParseTuple(args,(char *)"O:delete_HeaderInfoList",&obj0)) goto fail;
- if ((SWIG_ConvertPtr(obj0,(void **) &arg1,
SWIGTYPE_p_HeaderInfoList,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
- delete arg1;
-
- Py_INCREF(Py_None); resultobj = Py_None;
- return resultobj;
- fail:
- return NULL;
-}
-
-
static PyObject * HeaderInfoList_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
@@ -1863,18 +1787,4 @@
-static PyObject *_wrap_new_FolderListingEntry(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- FolderListingEntry *result;
-
- if(!PyArg_ParseTuple(args,(char *)":new_FolderListingEntry")) goto fail;
- result = (FolderListingEntry *)new FolderListingEntry();
-
- resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_FolderListingEntry, 1);
- return resultobj;
- fail:
- return NULL;
-}
-
-
static PyObject * FolderListingEntry_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
@@ -1921,6 +1831,4 @@
{ (char *)"MailFolder_GetFlags", _wrap_MailFolder_GetFlags, METH_VARARGS },
{ (char *)"MailFolder_ApplyFilterRules", _wrap_MailFolder_ApplyFilterRules,
METH_VARARGS },
- { (char *)"new_MailFolder", _wrap_new_MailFolder, METH_VARARGS },
- { (char *)"delete_MailFolder", _wrap_delete_MailFolder, METH_VARARGS },
{ (char *)"MailFolder_swigregister", MailFolder_swigregister, METH_VARARGS },
{ (char *)"HeaderInfo_GetSubject", _wrap_HeaderInfo_GetSubject, METH_VARARGS
},
@@ -1933,15 +1841,11 @@
{ (char *)"HeaderInfo_GetSize", _wrap_HeaderInfo_GetSize, METH_VARARGS },
{ (char *)"HeaderInfo_GetLines", _wrap_HeaderInfo_GetLines, METH_VARARGS },
- { (char *)"delete_HeaderInfo", _wrap_delete_HeaderInfo, METH_VARARGS },
{ (char *)"HeaderInfo_swigregister", HeaderInfo_swigregister, METH_VARARGS },
{ (char *)"HeaderInfoList_Count", _wrap_HeaderInfoList_Count, METH_VARARGS },
{ (char *)"HeaderInfoList_GetItem", _wrap_HeaderInfoList_GetItem,
METH_VARARGS },
- { (char *)"new_HeaderInfoList", _wrap_new_HeaderInfoList, METH_VARARGS },
- { (char *)"delete_HeaderInfoList", _wrap_delete_HeaderInfoList, METH_VARARGS
},
{ (char *)"HeaderInfoList_swigregister", HeaderInfoList_swigregister,
METH_VARARGS },
{ (char *)"FolderListingEntry_GetName", _wrap_FolderListingEntry_GetName,
METH_VARARGS },
{ (char *)"FolderListingEntry_GetAttribute",
_wrap_FolderListingEntry_GetAttribute, METH_VARARGS },
{ (char *)"delete_FolderListingEntry", _wrap_delete_FolderListingEntry,
METH_VARARGS },
- { (char *)"new_FolderListingEntry", _wrap_new_FolderListingEntry,
METH_VARARGS },
{ (char *)"FolderListingEntry_swigregister", FolderListingEntry_swigregister,
METH_VARARGS },
{ NULL, NULL }
Index: MAppBase.cpp-swig
===================================================================
RCS file: /cvsroot/mahogany/M/src/Python/MAppBase.cpp-swig,v
retrieving revision 1.32
retrieving revision 1.33
diff -b -u -2 -r1.32 -r1.33
--- MAppBase.cpp-swig 16 Oct 2003 01:42:42 -0000 1.32
+++ MAppBase.cpp-swig 19 Oct 2003 23:33:54 -0000 1.33
@@ -820,34 +820,4 @@
-static PyObject *_wrap_new_MAppBase(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- MAppBase *result;
-
- if(!PyArg_ParseTuple(args,(char *)":new_MAppBase")) goto fail;
- result = (MAppBase *)new MAppBase();
-
- resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_MAppBase, 1);
- return resultobj;
- fail:
- return NULL;
-}
-
-
-static PyObject *_wrap_delete_MAppBase(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- MAppBase *arg1 = (MAppBase *) 0 ;
- PyObject * obj0 = 0 ;
-
- if(!PyArg_ParseTuple(args,(char *)"O:delete_MAppBase",&obj0)) goto fail;
- if ((SWIG_ConvertPtr(obj0,(void **) &arg1,
SWIGTYPE_p_MAppBase,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
- delete arg1;
-
- Py_INCREF(Py_None); resultobj = Py_None;
- return resultobj;
- fail:
- return NULL;
-}
-
-
static PyObject * MAppBase_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
@@ -1094,6 +1064,4 @@
{ (char *)"MAppBase_GetMimeManager", _wrap_MAppBase_GetMimeManager,
METH_VARARGS },
{ (char *)"MAppBase_GetProfile", _wrap_MAppBase_GetProfile, METH_VARARGS },
- { (char *)"new_MAppBase", _wrap_new_MAppBase, METH_VARARGS },
- { (char *)"delete_MAppBase", _wrap_delete_MAppBase, METH_VARARGS },
{ (char *)"MAppBase_swigregister", MAppBase_swigregister, METH_VARARGS },
{ (char *)"wxGetApp", _wrap_wxGetApp, METH_VARARGS },
Index: Message.cpp-swig
===================================================================
RCS file: /cvsroot/mahogany/M/src/Python/Message.cpp-swig,v
retrieving revision 1.29
retrieving revision 1.30
diff -b -u -2 -r1.29 -r1.30
--- Message.cpp-swig 16 Oct 2003 01:42:42 -0000 1.29
+++ Message.cpp-swig 19 Oct 2003 23:33:54 -0000 1.30
@@ -752,34 +752,4 @@
-static PyObject *_wrap_new_MessageParameter(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- MessageParameter *result;
-
- if(!PyArg_ParseTuple(args,(char *)":new_MessageParameter")) goto fail;
- result = (MessageParameter *)new MessageParameter();
-
- resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_MessageParameter, 1);
- return resultobj;
- fail:
- return NULL;
-}
-
-
-static PyObject *_wrap_delete_MessageParameter(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- MessageParameter *arg1 = (MessageParameter *) 0 ;
- PyObject * obj0 = 0 ;
-
- if(!PyArg_ParseTuple(args,(char *)"O:delete_MessageParameter",&obj0)) goto fail;
- if ((SWIG_ConvertPtr(obj0,(void **) &arg1,
SWIGTYPE_p_MessageParameter,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
- delete arg1;
-
- Py_INCREF(Py_None); resultobj = Py_None;
- return resultobj;
- fail:
- return NULL;
-}
-
-
static PyObject * MessageParameter_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
@@ -1213,34 +1183,4 @@
-static PyObject *_wrap_new_Message(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- Message *result;
-
- if(!PyArg_ParseTuple(args,(char *)":new_Message")) goto fail;
- result = (Message *)new Message();
-
- resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_Message, 1);
- return resultobj;
- fail:
- return NULL;
-}
-
-
-static PyObject *_wrap_delete_Message(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- Message *arg1 = (Message *) 0 ;
- PyObject * obj0 = 0 ;
-
- if(!PyArg_ParseTuple(args,(char *)"O:delete_Message",&obj0)) goto fail;
- if ((SWIG_ConvertPtr(obj0,(void **) &arg1,
SWIGTYPE_p_Message,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
- delete arg1;
-
- Py_INCREF(Py_None); resultobj = Py_None;
- return resultobj;
- fail:
- return NULL;
-}
-
-
static PyObject * Message_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
@@ -1255,6 +1195,4 @@
{ (char *)"MessageParameter_value_set", _wrap_MessageParameter_value_set,
METH_VARARGS },
{ (char *)"MessageParameter_value_get", _wrap_MessageParameter_value_get,
METH_VARARGS },
- { (char *)"new_MessageParameter", _wrap_new_MessageParameter, METH_VARARGS },
- { (char *)"delete_MessageParameter", _wrap_delete_MessageParameter,
METH_VARARGS },
{ (char *)"MessageParameter_swigregister", MessageParameter_swigregister,
METH_VARARGS },
{ (char *)"Message_GetHeaderLine", _wrap_Message_GetHeaderLine, METH_VARARGS
},
@@ -1278,6 +1216,4 @@
{ (char *)"Message_GetDate", _wrap_Message_GetDate, METH_VARARGS },
{ (char *)"Message_WriteToString", _wrap_Message_WriteToString, METH_VARARGS
},
- { (char *)"new_Message", _wrap_new_Message, METH_VARARGS },
- { (char *)"delete_Message", _wrap_delete_Message, METH_VARARGS },
{ (char *)"Message_swigregister", Message_swigregister, METH_VARARGS },
{ NULL, NULL }
Index: MObject.cpp-swig
===================================================================
RCS file: /cvsroot/mahogany/M/src/Python/MObject.cpp-swig,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -u -2 -r1.12 -r1.13
--- MObject.cpp-swig 16 Oct 2003 01:42:42 -0000 1.12
+++ MObject.cpp-swig 19 Oct 2003 23:33:54 -0000 1.13
@@ -688,34 +688,4 @@
-static PyObject *_wrap_new_MObject(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- MObject *result;
-
- if(!PyArg_ParseTuple(args,(char *)":new_MObject")) goto fail;
- result = (MObject *)new MObject();
-
- resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_MObject, 1);
- return resultobj;
- fail:
- return NULL;
-}
-
-
-static PyObject *_wrap_delete_MObject(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- MObject *arg1 = (MObject *) 0 ;
- PyObject * obj0 = 0 ;
-
- if(!PyArg_ParseTuple(args,(char *)"O:delete_MObject",&obj0)) goto fail;
- if ((SWIG_ConvertPtr(obj0,(void **) &arg1,
SWIGTYPE_p_MObject,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
- delete arg1;
-
- Py_INCREF(Py_None); resultobj = Py_None;
- return resultobj;
- fail:
- return NULL;
-}
-
-
static PyObject * MObject_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
@@ -758,34 +728,4 @@
-static PyObject *_wrap_new_MObjectRC(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- MObjectRC *result;
-
- if(!PyArg_ParseTuple(args,(char *)":new_MObjectRC")) goto fail;
- result = (MObjectRC *)new MObjectRC();
-
- resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_MObjectRC, 1);
- return resultobj;
- fail:
- return NULL;
-}
-
-
-static PyObject *_wrap_delete_MObjectRC(PyObject *self, PyObject *args) {
- PyObject *resultobj;
- MObjectRC *arg1 = (MObjectRC *) 0 ;
- PyObject * obj0 = 0 ;
-
- if(!PyArg_ParseTuple(args,(char *)"O:delete_MObjectRC",&obj0)) goto fail;
- if ((SWIG_ConvertPtr(obj0,(void **) &arg1,
SWIGTYPE_p_MObjectRC,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
- delete arg1;
-
- Py_INCREF(Py_None); resultobj = Py_None;
- return resultobj;
- fail:
- return NULL;
-}
-
-
static PyObject * MObjectRC_swigregister(PyObject *self, PyObject *args) {
PyObject *obj;
@@ -797,11 +737,7 @@
static PyMethodDef SwigMethods[] = {
{ (char *)"MObject_CheckLeaks", _wrap_MObject_CheckLeaks, METH_VARARGS },
- { (char *)"new_MObject", _wrap_new_MObject, METH_VARARGS },
- { (char *)"delete_MObject", _wrap_delete_MObject, METH_VARARGS },
{ (char *)"MObject_swigregister", MObject_swigregister, METH_VARARGS },
{ (char *)"MObjectRC_IncRef", _wrap_MObjectRC_IncRef, METH_VARARGS },
{ (char *)"MObjectRC_DecRef", _wrap_MObjectRC_DecRef, METH_VARARGS },
- { (char *)"new_MObjectRC", _wrap_new_MObjectRC, METH_VARARGS },
- { (char *)"delete_MObjectRC", _wrap_delete_MObjectRC, METH_VARARGS },
{ (char *)"MObjectRC_swigregister", MObjectRC_swigregister, METH_VARARGS },
{ NULL, NULL }
Index: MTest.cpp-swig
===================================================================
RCS file: /cvsroot/mahogany/M/src/Python/MTest.cpp-swig,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -2 -r1.3 -r1.4
--- MTest.cpp-swig 25 Feb 2001 15:15:29 -0000 1.3
+++ MTest.cpp-swig 19 Oct 2003 23:33:54 -0000 1.4
@@ -1,5 +1,5 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3u-20010202-2047 (Alpha 5)
+ * Version 1.3.19
*
* This file is not intended to be easily readable and contains a number of
@@ -10,4 +10,20 @@
#define SWIGPYTHON
+
+#ifdef __cplusplus
+template<class T> class SwigValueWrapper {
+ T *tt;
+public:
+ inline SwigValueWrapper() : tt(0) { }
+ inline ~SwigValueWrapper() { if (tt) delete tt; }
+ inline SwigValueWrapper& operator=(const T& t) { tt = new T(t); return *this; }
+ inline operator T&() const { return *tt; }
+ inline T *operator&() { return tt; }
+};
+#endif
+
+
+#include "MPython.h"
+
/***********************************************************************
* common.swg
@@ -31,16 +47,21 @@
# if defined(STATIC_LINKED)
# define SWIGEXPORT(a) a
+# define SWIGIMPORT(a) extern a
# else
# define SWIGEXPORT(a) __declspec(dllexport) a
+# define SWIGIMPORT(a) extern a
# endif
# else
# if defined(__BORLANDC__)
# define SWIGEXPORT(a) a _export
+# define SWIGIMPORT(a) a _export
# else
# define SWIGEXPORT(a) a
+# define SWIGIMPORT(a) a
+# endif
# endif
-#endif
#else
# define SWIGEXPORT(a) a
+# define SWIGIMPORT(a) a
#endif
@@ -55,8 +76,13 @@
#endif
+typedef void *(*swig_converter_func)(void *);
+typedef struct swig_type_info *(*swig_dycast_func)(void **);
+
typedef struct swig_type_info {
- char *name;
- void *(*converter)(void *);
- char *str;
+ const char *name;
+ swig_converter_func converter;
+ const char *str;
+ void *clientdata;
+ swig_dycast_func dcast;
struct swig_type_info *next;
struct swig_type_info *prev;
@@ -64,7 +90,13 @@
#ifdef SWIG_NOINCLUDE
-SWIGEXPORT(swig_type_info *) SWIG_TypeRegister(swig_type_info *);
-SWIGEXPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
-SWIGEXPORT(void *) SWIG_TypeCast(swig_type_info *, void *);
+
+SWIGIMPORT(swig_type_info *) SWIG_TypeRegister(swig_type_info *);
+SWIGIMPORT(swig_type_info *) SWIG_TypeCheck(char *c, swig_type_info *);
+SWIGIMPORT(void *) SWIG_TypeCast(swig_type_info *, void *);
+SWIGIMPORT(swig_type_info *) SWIG_TypeDynamicCast(swig_type_info *, void **);
+SWIGIMPORT(const char *) SWIG_TypeName(const swig_type_info *);
+SWIGIMPORT(swig_type_info *) SWIG_TypeQuery(const char *);
+SWIGIMPORT(void) SWIG_TypeClientData(swig_type_info *, void *);
+
#else
@@ -81,4 +113,5 @@
if (strcmp(tc->name, ti->name) == 0) {
/* Already exists in the table. Just add additional types to the list */
+ if (tc->clientdata) ti->clientdata = tc->clientdata;
head = tc;
next = tc->next;
@@ -105,4 +138,5 @@
tc++;
}
+ if (next) next->prev = head; /**/
head->next = next;
return ret;
@@ -116,5 +150,5 @@
if (!ty) return 0; /* Void pointer */
s = ty->next; /* First element always just a name */
- while (s) {
+ do {
if (strcmp(s->name,c) == 0) {
if (s == ty->next) return s;
@@ -128,12 +162,13 @@
if (ty->next) ty->next->prev = s;
ty->next = s;
+ s->prev = ty; /**/
return s;
}
s = s->next;
- }
+ } while (s && (s != ty->next));
return 0;
}
-/* Cast a pointer (needed for C++ inheritance */
+/* Cast a pointer up an inheritance hierarchy */
SWIGRUNTIME(void *)
SWIG_TypeCast(swig_type_info *ty, void *ptr)
@@ -143,6 +178,25 @@
}
+/* Dynamic pointer casting. Down an inheritance hierarchy */
+SWIGRUNTIME(swig_type_info *)
+SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr)
+{
+ swig_type_info *lastty = ty;
+ if (!ty || !ty->dcast) return ty;
+ while (ty && (ty->dcast)) {
+ ty = (*ty->dcast)(ptr);
+ if (ty) lastty = ty;
+ }
+ return lastty;
+}
+
+/* Return the name associated with this type */
+SWIGRUNTIME(const char *)
+SWIG_TypeName(const swig_type_info *ty) {
+ return ty->name;
+}
+
/* Search for a swig_type_info structure */
-SWIGRUNTIME(void *)
+SWIGRUNTIME(swig_type_info *)
SWIG_TypeQuery(const char *name) {
swig_type_info *ty = swig_type_list;
@@ -155,11 +209,29 @@
}
+/* Set the clientdata field for a type */
+SWIGRUNTIME(void)
+SWIG_TypeClientData(swig_type_info *ti, void *clientdata) {
+ swig_type_info *tc, *equiv;
+ if (ti->clientdata == clientdata) return;
+ ti->clientdata = clientdata;
+ equiv = ti->next;
+ while (equiv) {
+ if (!equiv->converter) {
+ tc = swig_type_list;
+ while (tc) {
+ if ((strcmp(tc->name, equiv->name) == 0))
+ SWIG_TypeClientData(tc,clientdata);
+ tc = tc->prev;
+ }
+ }
+ equiv = equiv->next;
+ }
+}
#endif
#ifdef __cplusplus
}
-#endif
-
+#endif
/***********************************************************************
@@ -173,6 +245,5 @@
************************************************************************/
-#include <stdlib.h>
-#include "Python.h"
+#include "MPython.h"
#ifdef __cplusplus
@@ -184,4 +255,13 @@
#define SWIG_PY_STRING 3
#define SWIG_PY_POINTER 4
+#define SWIG_PY_BINARY 5
+
+/* Flags for pointer conversion */
+
+#define SWIG_POINTER_EXCEPTION 0x1
+#define SWIG_POINTER_DISOWN 0x2
+
+/* Exception handling in wrappers */
+#define SWIG_fail goto fail
/* Constant information structure */
@@ -197,11 +277,13 @@
#ifdef SWIG_NOINCLUDE
-SWIGEXPORT(PyObject *) SWIG_newvarlink();
+SWIGEXPORT(PyObject *) SWIG_newvarlink(void);
SWIGEXPORT(void) SWIG_addvarlink(PyObject *, char *, PyObject
*(*)(void), int (*)(PyObject *));
SWIGEXPORT(int) SWIG_ConvertPtr(PyObject *, void **, swig_type_info *,
int);
-SWIGEXPORT(void) SWIG_MakePtr(char *c, void *, swig_type_info *);
-SWIGEXPORT(PyObject *) SWIG_NewPointerObj(void *, swig_type_info *);
+SWIGEXPORT(int) SWIG_ConvertPacked(PyObject *, void *, int sz,
swig_type_info *, int);
+SWIGEXPORT(char *) SWIG_PackData(char *c, void *, int);
+SWIGEXPORT(char *) SWIG_UnpackData(char *c, void *, int);
+SWIGEXPORT(PyObject *) SWIG_NewPointerObj(void *, swig_type_info *,int own);
+SWIGEXPORT(PyObject *) SWIG_NewPackedObj(void *, int sz, swig_type_info *);
SWIGEXPORT(void) SWIG_InstallConstants(PyObject *d, swig_const_info
constants[]);
-
#else
@@ -270,5 +352,5 @@
PyObject_HEAD_INIT(0)
0,
- "swigvarlink", /* Type name */
+ (char *)"swigvarlink", /* Type name */
sizeof(swig_varlinkobject), /* Basic size */
0, /* Itemsize */
@@ -311,15 +393,54 @@
v->vars = gv;
}
+
+/* Pack binary data into a string */
+SWIGRUNTIME(char *)
+SWIG_PackData(char *c, void *ptr, int sz) {
+ static char hex[17] = "0123456789abcdef";
+ int i;
+ unsigned char *u = (unsigned char *) ptr;
+ register unsigned char uu;
+ for (i = 0; i < sz; i++,u++) {
+ uu = *u;
+ *(c++) = hex[(uu & 0xf0) >> 4];
+ *(c++) = hex[uu & 0xf];
+ }
+ return c;
+}
+
+/* Unpack binary data from a string */
+SWIGRUNTIME(char *)
+SWIG_UnpackData(char *c, void *ptr, int sz) {
+ register unsigned char uu = 0;
+ register int d;
+ unsigned char *u = (unsigned char *) ptr;
+ int i;
+ for (i = 0; i < sz; i++, u++) {
+ d = *(c++);
+ if ((d >= '0') && (d <= '9'))
+ uu = ((d - '0') << 4);
+ else if ((d >= 'a') && (d <= 'f'))
+ uu = ((d - ('a'-10)) << 4);
+ d = *(c++);
+ if ((d >= '0') && (d <= '9'))
+ uu |= (d - '0');
+ else if ((d >= 'a') && (d <= 'f'))
+ uu |= (d - ('a'-10));
+ *u = uu;
+ }
+ return c;
+}
+
/* Convert a pointer value */
SWIGRUNTIME(int)
SWIG_ConvertPtr(PyObject *obj, void **ptr, swig_type_info *ty, int flags) {
- unsigned long p;
- register int d;
swig_type_info *tc;
char *c;
static PyObject *SWIG_this = 0;
int newref = 0;
+ PyObject *pyobj = 0;
- if (!obj || (obj == Py_None)) {
+ if (!obj) return 0;
+ if (obj == Py_None) {
*ptr = 0;
return 0;
@@ -328,5 +449,6 @@
if (!(PyCObject_Check(obj))) {
if (!SWIG_this)
- SWIG_this = PyString_InternFromString("this");
+ SWIG_this = PyString_FromString("this");
+ pyobj = obj;
obj = PyObject_GetAttr(obj,SWIG_this);
newref = 1;
@@ -344,5 +466,6 @@
if (!(PyString_Check(obj))) {
if (!SWIG_this)
- SWIG_this = PyString_InternFromString("this");
+ SWIG_this = PyString_FromString("this");
+ pyobj = obj;
obj = PyObject_GetAttr(obj,SWIG_this);
newref = 1;
@@ -354,29 +477,18 @@
}
c = PyString_AsString(obj);
- p = 0;
/* Pointer values must start with leading underscore */
if (*c != '_') {
*ptr = (void *) 0;
if (strcmp(c,"NULL") == 0) {
- if (newref) Py_DECREF(obj);
+ if (newref) { Py_DECREF(obj); }
return 0;
} else {
- if (newref) Py_DECREF(obj);
+ if (newref) { Py_DECREF(obj); }
goto type_error;
}
}
c++;
- /* Extract hex value from pointer */
- while ((d = *c)) {
- if ((d >= '0') && (d <= '9'))
- p = (p << 4) + (d - '0');
- else if ((d >= 'a') && (d <= 'f'))
- p = (p << 4) + (d - ('a'-10));
- else
- break;
- c++;
- }
- *ptr = (void *) p;
- if (newref) Py_DECREF(obj);
+ c = SWIG_UnpackData(c,ptr,sizeof(void *));
+ if (newref) { Py_DECREF(obj); }
#endif
@@ -388,11 +500,16 @@
tc = SWIG_TypeCheck(c,ty);
if (!tc) goto type_error;
- *ptr = SWIG_TypeCast(tc,(void*)p);
+ *ptr = SWIG_TypeCast(tc,(void*) *ptr);
+ }
+
+ if ((pyobj) && (flags & SWIG_POINTER_DISOWN)) {
+ PyObject *zero = PyInt_FromLong(0);
+ PyObject_SetAttrString(pyobj,(char*)"thisown",zero);
+ Py_DECREF(zero);
}
return 0;
type_error:
-
- if (flags) {
+ if (flags & SWIG_POINTER_EXCEPTION) {
if (ty) {
char *temp = (char *) malloc(64+strlen(ty->name));
@@ -407,31 +524,40 @@
}
-/* Take a pointer and convert it to a string */
-SWIGRUNTIME(void)
-SWIG_MakePtr(char *c, void *ptr, swig_type_info *ty) {
- static char hex[17] = "0123456789abcdef";
- unsigned long p, s;
- char result[32], *r;
- r = result;
- p = (unsigned long) ptr;
- if (p > 0) {
- while (p > 0) {
- s = p & 0xf;
- *(r++) = hex[s];
- p = p >> 4;
- }
- *r = '_';
- while (r >= result)
- *(c++) = *(r--);
- strcpy (c, ty->name);
+/* Convert a packed value value */
+SWIGRUNTIME(int)
+SWIG_ConvertPacked(PyObject *obj, void *ptr, int sz, swig_type_info *ty, int flags) {
+ swig_type_info *tc;
+ char *c;
+
+ if ((!obj) || (!PyString_Check(obj))) goto type_error;
+ c = PyString_AsString(obj);
+ /* Pointer values must start with leading underscore */
+ if (*c != '_') goto type_error;
+ c++;
+ c = SWIG_UnpackData(c,ptr,sz);
+ if (ty) {
+ tc = SWIG_TypeCheck(c,ty);
+ if (!tc) goto type_error;
+ }
+ return 0;
+
+type_error:
+
+ if (flags) {
+ if (ty) {
+ char *temp = (char *) malloc(64+strlen(ty->name));
+ sprintf(temp,"Type error. Expected %s", ty->name);
+ PyErr_SetString(PyExc_TypeError, temp);
+ free((char *) temp);
} else {
- strcpy (c, "NULL");
+ PyErr_SetString(PyExc_TypeError,"Expected a pointer");
+ }
}
+ return -1;
}
/* Create a new pointer object */
SWIGRUNTIME(PyObject *)
-SWIG_NewPointerObj(void *ptr, swig_type_info *type) {
- char result[512];
+SWIG_NewPointerObj(void *ptr, swig_type_info *type, int own) {
PyObject *robj;
if (!ptr) {
@@ -440,12 +566,45 @@
}
#ifdef SWIG_COBJECT_TYPES
- robj = PyCObject_FromVoidPtrAndDesc((void *) ptr, type->name, NULL);
+ robj = PyCObject_FromVoidPtrAndDesc((void *) ptr, (char *) type->name, NULL);
#else
- SWIG_MakePtr(result,ptr,type);
+ {
+ char result[1024];
+ char *r = result;
+ *(r++) = '_';
+ r = SWIG_PackData(r,&ptr,sizeof(void *));
+ strcpy(r,type->name);
robj = PyString_FromString(result);
+ }
#endif
+ if (!robj || (robj == Py_None)) return robj;
+ if (type->clientdata) {
+ PyObject *inst;
+ PyObject *args = Py_BuildValue((char*)"(O)", robj);
+ Py_DECREF(robj);
+ inst = PyObject_CallObject((PyObject *) type->clientdata, args);
+ Py_DECREF(args);
+ if (inst) {
+ if (own) {
+ PyObject *n = PyInt_FromLong(1);
+ PyObject_SetAttrString(inst,(char*)"thisown",n);
+ Py_DECREF(n);
+ }
+ robj = inst;
+ }
+ }
return robj;
}
+SWIGRUNTIME(PyObject *)
+SWIG_NewPackedObj(void *ptr, int sz, swig_type_info *type) {
+ char result[1024];
+ char *r = result;
+ if ((2*sz + 1 + strlen(type->name)) > 1000) return 0;
+ *(r++) = '_';
+ r = SWIG_PackData(r,ptr,sz);
+ strcpy(r,type->name);
+ return PyString_FromString(result);
+}
+
/* Install Constants */
SWIGRUNTIME(void)
@@ -465,5 +624,8 @@
break;
case SWIG_PY_POINTER:
- obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype);
+ obj = SWIG_NewPointerObj(constants[i].pvalue, *(constants[i]).ptype,0);
+ break;
+ case SWIG_PY_BINARY:
+ obj = SWIG_NewPackedObj(constants[i].pvalue, constants[i].lvalue,
*(constants[i].ptype));
break;
default:
@@ -486,4 +648,9 @@
+
+
+
+
+
/* -------- TYPES TABLE (BEGIN) -------- */
@@ -495,11 +662,12 @@
/*-----------------------------------------------
- @(target):= MTestc.so
+ @(target):= _MTest.so
------------------------------------------------*/
-#define SWIG_init initMTestc
+#define SWIG_init init_MTest
-#define SWIG_name "MTestc"
+#define SWIG_name "_MTest"
#include "MTest.h"
+
#ifdef __cplusplus
extern "C" {
@@ -507,10 +675,13 @@
static PyObject *_wrap_new_MTest(PyObject *self, PyObject *args) {
PyObject *resultobj;
- MTest *result ;
+ MTest *result;
- if(!PyArg_ParseTuple(args,":new_MTest")) return NULL;
+ if(!PyArg_ParseTuple(args,(char *)":new_MTest")) goto fail;
result = (MTest *)new MTest();
- resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_MTest);
+
+ resultobj = SWIG_NewPointerObj((void *) result, SWIGTYPE_p_MTest, 1);
return resultobj;
+ fail:
+ return NULL;
}
@@ -518,13 +689,15 @@
static PyObject *_wrap_delete_MTest(PyObject *self, PyObject *args) {
PyObject *resultobj;
- MTest *arg0 ;
- PyObject * argo0 =0 ;
+ MTest *arg1 = (MTest *) 0 ;
+ PyObject * obj0 = 0 ;
- if(!PyArg_ParseTuple(args,"O:delete_MTest",&argo0)) return NULL;
- if ((SWIG_ConvertPtr(argo0,(void **) &arg0,SWIGTYPE_p_MTest,1)) == -1) return
NULL;
- delete arg0;
- Py_INCREF(Py_None);
- resultobj = Py_None;
+ if(!PyArg_ParseTuple(args,(char *)"O:delete_MTest",&obj0)) goto fail;
+ if ((SWIG_ConvertPtr(obj0,(void **) &arg1,
SWIGTYPE_p_MTest,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+ delete arg1;
+
+ Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
+ fail:
+ return NULL;
}
@@ -532,14 +705,16 @@
static PyObject *_wrap_MTest_SetValue(PyObject *self, PyObject *args) {
PyObject *resultobj;
- MTest *arg0 ;
- int arg1 ;
- PyObject * argo0 =0 ;
-
- if(!PyArg_ParseTuple(args,"Oi:MTest_SetValue",&argo0,&arg1)) return NULL;
- if ((SWIG_ConvertPtr(argo0,(void **) &arg0,SWIGTYPE_p_MTest,1)) == -1) return
NULL;
- arg0->SetValue(arg1);
- Py_INCREF(Py_None);
- resultobj = Py_None;
+ MTest *arg1 = (MTest *) 0 ;
+ int arg2 ;
+ PyObject * obj0 = 0 ;
+
+ if(!PyArg_ParseTuple(args,(char *)"Oi:MTest_SetValue",&obj0,&arg2)) goto fail;
+ if ((SWIG_ConvertPtr(obj0,(void **) &arg1,
SWIGTYPE_p_MTest,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+ (arg1)->SetValue(arg2);
+
+ Py_INCREF(Py_None); resultobj = Py_None;
return resultobj;
+ fail:
+ return NULL;
}
@@ -547,31 +722,39 @@
static PyObject *_wrap_MTest_GetValue(PyObject *self, PyObject *args) {
PyObject *resultobj;
- MTest *arg0 ;
- PyObject * argo0 =0 ;
- int result ;
-
- if(!PyArg_ParseTuple(args,"O:MTest_GetValue",&argo0)) return NULL;
- if ((SWIG_ConvertPtr(argo0,(void **) &arg0,SWIGTYPE_p_MTest,1)) == -1) return
NULL;
- result = (int )arg0->GetValue();
+ MTest *arg1 = (MTest *) 0 ;
+ int result;
+ PyObject * obj0 = 0 ;
+
+ if(!PyArg_ParseTuple(args,(char *)"O:MTest_GetValue",&obj0)) goto fail;
+ if ((SWIG_ConvertPtr(obj0,(void **) &arg1,
SWIGTYPE_p_MTest,SWIG_POINTER_EXCEPTION | 0 )) == -1) SWIG_fail;
+ result = (int)(arg1)->GetValue();
+
resultobj = PyInt_FromLong((long)result);
return resultobj;
+ fail:
+ return NULL;
}
-static PyMethodDef MTestcMethods[] = {
- { "new_MTest", _wrap_new_MTest, METH_VARARGS },
- { "delete_MTest", _wrap_delete_MTest, METH_VARARGS },
- { "MTest_SetValue", _wrap_MTest_SetValue, METH_VARARGS },
- { "MTest_GetValue", _wrap_MTest_GetValue, METH_VARARGS },
+static PyObject * MTest_swigregister(PyObject *self, PyObject *args) {
+ PyObject *obj;
+ if (!PyArg_ParseTuple(args,(char*)"O", &obj)) return NULL;
+ SWIG_TypeClientData(SWIGTYPE_p_MTest, obj);
+ Py_INCREF(obj);
+ return Py_BuildValue((char *)"");
+}
+static PyMethodDef SwigMethods[] = {
+ { (char *)"new_MTest", _wrap_new_MTest, METH_VARARGS },
+ { (char *)"delete_MTest", _wrap_delete_MTest, METH_VARARGS },
+ { (char *)"MTest_SetValue", _wrap_MTest_SetValue, METH_VARARGS },
+ { (char *)"MTest_GetValue", _wrap_MTest_GetValue, METH_VARARGS },
+ { (char *)"MTest_swigregister", MTest_swigregister, METH_VARARGS },
{ NULL, NULL }
};
-#ifdef __cplusplus
-}
-#endif
/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (BEGIN) -------- */
-static swig_type_info _swigt__p_MTest[] = {{"_p_MTest", 0, "MTest
*"},{"_p_MTest"},{0}};
+static swig_type_info _swigt__p_MTest[] = {{"_p_MTest", 0, "MTest *",
0},{"_p_MTest"},{0}};
static swig_type_info *swig_types_initial[] = {
@@ -586,18 +769,28 @@
{0}};
-static PyObject *SWIG_globals;
+#ifdef __cplusplus
+}
+#endif
+
#ifdef __cplusplus
extern "C"
#endif
-SWIGEXPORT(void) initMTestc(void) {
+SWIGEXPORT(void) SWIG_init(void) {
+ static PyObject *SWIG_globals = 0;
+ static int typeinit = 0;
PyObject *m, *d;
int i;
- SWIG_globals = SWIG_newvarlink();
- m = Py_InitModule("MTestc", MTestcMethods);
+ if (!SWIG_globals) SWIG_globals = SWIG_newvarlink();
+ m = Py_InitModule((char *) SWIG_name, SwigMethods);
d = PyModule_GetDict(m);
+
+ if (!typeinit) {
for (i = 0; swig_types_initial[i]; i++) {
swig_types[i] = SWIG_TypeRegister(swig_types_initial[i]);
}
+ typeinit = 1;
+ }
SWIG_InstallConstants(d,swig_const_table);
+
}
-------------------------------------------------------
This SF.net email sponsored by: Enterprise Linux Forum Conference & Expo
The Event For Linux Datacenter Solutions & Strategies in The Enterprise
Linux in the Boardroom; in the Front Office; & in the Server Room
http://www.enterpriselinuxforum.com
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
