if (! swigType) {
// it wasn't in the cache, so look it up from SWIG
name.Append(wxT(" *"));
- swigType = SWIG_Python_TypeQuery(name.mb_str());
+ swigType = SWIG_TypeQuery(name.mb_str());
// if it still wasn't found, try looking for a mapped name
if (!swigType) {
(char*)(const char*)name.mbc_str())) != NULL) {
name = wxString(PyString_AsString(item), *wxConvCurrent);
name.Append(wxT(" *"));
- swigType = SWIG_Python_TypeQuery(name.mb_str());
+ swigType = SWIG_TypeQuery(name.mb_str());
}
}
if (swigType) {
const wxChar* className) {
swig_type_info* swigType = wxPyFindSwigType(className);
- wxCHECK_MSG(swigType != NULL, False, wxT("Unknown type in wxPyConvertSwigPtr"));
+ wxCHECK_MSG(swigType != NULL, false, wxT("Unknown type in wxPyConvertSwigPtr"));
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 = PyCObject_FromVoidPtrAndDesc((void *) ptr, (char *) swigType->name, NULL);
+ robj = PySwigObject_FromVoidPtrAndDesc((void *) ptr, (char *)swigType->name);
#else
{
char result[1024];
- char *r = result;
- *(r++) = '_';
- r = SWIG_Python_PackData(r, &ptr, sizeof(void *));
- strcpy(r, swigType->name);
- robj = PyString_FromString(result);
- }
+ robj = SWIG_PackVoidPtr(result, ptr, swigType->name, sizeof(result)) ?
+ 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...
+bool wxPyInstance_Check(PyObject* obj) {
+ return PyObject_HasAttrString(obj, "__class__") != 0;
+}
+
+// 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) {
+ static PyObject* this_str = NULL;
+ if (this_str == NULL)
+ this_str = PyString_FromString("this");
+
+ PyObject* this_attr = PyObject_GetAttr(obj, this_str);
+ if (this_attr) {
+ bool retval = (PySwigObject_Check(this_attr) != 0);
+ Py_DECREF(this_attr);
+ return retval;
+ }
+ PyErr_Clear();
+ return false;
+}
// Export a C API in a struct. Other modules will be able to load this from
-// the wx.core module and will then have safe access to these functions, even if
-// they are located in another shared library.
+// the wx._core_ module and will then have safe access to these functions,
+// even if they are located in another shared library.
static wxPyCoreAPI API = {
- (p_SWIG_Python_TypeRegister_t)SWIG_Python_TypeRegister,
- (p_SWIG_Python_TypeCheck_t)SWIG_Python_TypeCheck,
- (p_SWIG_Python_TypeCast_t)SWIG_Python_TypeCast,
- (p_SWIG_Python_TypeDynamicCast_t)SWIG_Python_TypeDynamicCast,
- (p_SWIG_Python_TypeName_t)SWIG_Python_TypeName,
- (p_SWIG_Python_TypeQuery_t)SWIG_Python_TypeQuery,
- (p_SWIG_Python_TypeClientData_t)SWIG_Python_TypeClientData,
- (p_SWIG_Python_newvarlink_t)SWIG_Python_newvarlink,
- (p_SWIG_Python_addvarlink_t)SWIG_Python_addvarlink,
- (p_SWIG_Python_ConvertPtr_t)SWIG_Python_ConvertPtr,
- (p_SWIG_Python_ConvertPacked_t)SWIG_Python_ConvertPacked,
- (p_SWIG_Python_PackData_t)SWIG_Python_PackData,
- (p_SWIG_Python_UnpackData_t)SWIG_Python_UnpackData,
- (p_SWIG_Python_NewPointerObj_t)SWIG_Python_NewPointerObj,
- (p_SWIG_Python_NewPackedObj_t)SWIG_Python_NewPackedObj,
- (p_SWIG_Python_InstallConstants_t)SWIG_Python_InstallConstants,
- (p_SWIG_Python_MustGetPtr_t)SWIG_Python_MustGetPtr,
-
- (p_SWIG_PyObj_AsCharPtr_t)SWIG_PyObj_AsCharPtr,
- (p_SWIG_PyObj_FromCharPtr_t)SWIG_PyObj_FromCharPtr,
- (p_SWIG_PyObj_AsUnsignedLong_t)SWIG_PyObj_AsUnsignedLong,
- (p_SWIG_PyObj_AsLongInRange_t)SWIG_PyObj_AsLongInRange,
- (p_SWIG_PyObj_AsUnsignedLongInRange_t)SWIG_PyObj_AsUnsignedLongInRange,
- (p_SWIG_PyObj_AsNewCharPtr_t)SWIG_PyObj_AsNewCharPtr,
- (p_SWIG_PyObj_AsCharPtrAndSize_t)SWIG_PyObj_AsCharPtrAndSize,
- (p_SWIG_PyObj_AsCharArray_t)SWIG_PyObj_AsCharArray,
- (p_SWIG_PyObj_FromCharArray_t)SWIG_PyObj_FromCharArray,
- (p_SWIG_PyObj_AsFloatConv_t)SWIG_PyObj_AsFloatConv,
-
wxPyCheckSwigType,
wxPyConstructObject,
wxPyConvertSwigPtr,
wxPyOORClientData_dtor,
wxPyCBInputStream_create,
-
+ wxPyCBInputStream_copy,
+
wxPyInstance_Check,
- wxPySwigInstance_Check
+ wxPySwigInstance_Check,
+
+ wxPyCheckForApp
};