X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/02b800ce7c2bb1c1f08075f22be2e7412124b47f..30e24d9dd5a5abf1c9a375ea259eb239b122b7f7:/wxPython/src/_core_api.i?ds=sidebyside diff --git a/wxPython/src/_core_api.i b/wxPython/src/_core_api.i index 3ca6ae08f1..9fcad55a74 100644 --- a/wxPython/src/_core_api.i +++ b/wxPython/src/_core_api.i @@ -99,14 +99,18 @@ bool wxPyConvertSwigPtr(PyObject* obj, void **ptr, return SWIG_Python_ConvertPtr(obj, ptr, swigType, SWIG_POINTER_EXCEPTION) != -1; } +%} + +#if SWIG_VERSION < 0x010328 +%{ // Make a SWIGified pointer object suitable for a .this attribute PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) { PyObject* robj = NULL; swig_type_info* swigType = wxPyFindSwigType(className); - wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyConvertSwigPtr")); + wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyMakeSwigPtr")); #ifdef SWIG_COBJECT_TYPES robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)swigType->name); @@ -117,11 +121,29 @@ PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) { PyString_FromString(result) : 0; } #endif + return robj; +} +%} + +#else // SWIG_VERSION >= 1.3.28 +%{ +// Make a SWIGified pointer object suitable for a .this attribute +PyObject* wxPyMakeSwigPtr(void* ptr, const wxChar* className) { + + PyObject* robj = NULL; + swig_type_info* swigType = wxPyFindSwigType(className); + wxCHECK_MSG(swigType != NULL, NULL, wxT("Unknown type in wxPyMakeSwigPtr")); + + robj = PySwigObject_New(ptr, swigType, 0); return robj; } +%} +#endif + +%{ // Python's PyInstance_Check does not return True for instances of new-style // classes. This should get close enough for both new and old classes but I // should re-evaluate the need for doing instance checks... @@ -130,7 +152,6 @@ bool wxPyInstance_Check(PyObject* obj) { } - // This one checks if the object is an instance of a SWIG proxy class (it has // a .this attribute, and the .this attribute is a PySwigObject.) bool wxPySwigInstance_Check(PyObject* obj) { @@ -148,7 +169,6 @@ bool wxPySwigInstance_Check(PyObject* obj) { PyErr_Clear(); return false; } - // Export a C API in a struct. Other modules will be able to load this from @@ -215,7 +235,11 @@ static wxPyCoreAPI API = { wxPyInstance_Check, wxPySwigInstance_Check, - wxPyCheckForApp + wxPyCheckForApp, + + wxArrayDouble2PyList_helper, + wxPoint2D_LIST_helper, + wxRect2D_helper, };