[Python-checkins] python/dist/src/Mac/Modules/carbonevt CarbonEvtsupport.py,1.11,1.12 _CarbonEvtmodule.c,1.11,1.12
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Tue, 03 Dec 2002 15:40:51 -0800
Update of /cvsroot/python/python/dist/src/Mac/Modules/carbonevt
In directory sc8-pr-cvs1:/tmp/cvs-serv10318/carbonevt
Modified Files:
CarbonEvtsupport.py _CarbonEvtmodule.c
Log Message:
Added PEP253 support to most Carbon modules. This isn't complete yet:
some of the more compilcated cases (CF, Res) haven't been done yet. Also,
various types should inherit from each other (anything with an as_Resource
method should be a Resource subtype, the CF types should become one family).
Index: CarbonEvtsupport.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/carbonevt/CarbonEvtsupport.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CarbonEvtsupport.py 29 Nov 2002 23:40:42 -0000 1.11
--- CarbonEvtsupport.py 3 Dec 2002 23:40:19 -0000 1.12
***************
*** 216,220 ****
! class EventHandlerRefObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
def outputStructMembers(self):
Output("%s ob_itself;", self.itselftype)
--- 216,220 ----
! class EventHandlerRefObjectDefinition(PEP253Mixin, GlobalObjectDefinition):
def outputStructMembers(self):
Output("%s ob_itself;", self.itselftype)
***************
*** 229,233 ****
OutRbrace()
! class MyGlobalObjectDefinition(PEP252Mixin, GlobalObjectDefinition):
pass
--- 229,233 ----
OutRbrace()
! class MyGlobalObjectDefinition(PEP253Mixin, GlobalObjectDefinition):
pass
Index: _CarbonEvtmodule.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/Modules/carbonevt/_CarbonEvtmodule.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** _CarbonEvtmodule.c 29 Nov 2002 23:40:42 -0000 1.11
--- _CarbonEvtmodule.c 3 Dec 2002 23:40:19 -0000 1.12
***************
*** 411,414 ****
--- 411,415 ----
#define EventRef_getsetlist NULL
+
#define EventRef_compare NULL
***************
*** 416,419 ****
--- 417,438 ----
#define EventRef_hash NULL
+ #define EventRef_tp_init 0
+
+ #define EventRef_tp_alloc PyType_GenericAlloc
+
+ static PyObject *EventRef_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ PyObject *self;
+ EventRef itself;
+ char *kw[] = {"itself", 0};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, EventRef_Convert, &itself)) return NULL;
+ if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ ((EventRefObject *)self)->ob_itself = itself;
+ return self;
+ }
+
+ #define EventRef_tp_free PyObject_Del
+
PyTypeObject EventRef_Type = {
***************
*** 438,454 ****
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*outputHook_tp_as_buffer*/
! 0, /*outputHook_tp_flags*/
! 0, /*outputHook_tp_doc*/
! 0, /*outputHook_tp_traverse*/
! 0, /*outputHook_tp_clear*/
! 0, /*outputHook_tp_richcompare*/
! 0, /*outputHook_tp_weaklistoffset*/
! 0, /*outputHook_tp_iter*/
! 0, /*outputHook_tp_iternext*/
EventRef_methods, /* tp_methods */
! 0, /*outputHook_tp_members*/
EventRef_getsetlist, /*tp_getset*/
! 0, /*outputHook_tp_base*/
};
--- 457,481 ----
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*tp_as_buffer*/
! Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
! 0, /*tp_doc*/
! 0, /*tp_traverse*/
! 0, /*tp_clear*/
! 0, /*tp_richcompare*/
! 0, /*tp_weaklistoffset*/
! 0, /*tp_iter*/
! 0, /*tp_iternext*/
EventRef_methods, /* tp_methods */
! 0, /*tp_members*/
EventRef_getsetlist, /*tp_getset*/
! 0, /*tp_base*/
! 0, /*tp_dict*/
! 0, /*tp_descr_get*/
! 0, /*tp_descr_set*/
! 0, /*tp_dictoffset*/
! EventRef_tp_init, /* tp_init */
! EventRef_tp_alloc, /* tp_alloc */
! EventRef_tp_new, /* tp_new */
! EventRef_tp_free, /* tp_free */
};
***************
*** 604,607 ****
--- 631,635 ----
#define EventQueueRef_getsetlist NULL
+
#define EventQueueRef_compare NULL
***************
*** 609,612 ****
--- 637,658 ----
#define EventQueueRef_hash NULL
+ #define EventQueueRef_tp_init 0
+
+ #define EventQueueRef_tp_alloc PyType_GenericAlloc
+
+ static PyObject *EventQueueRef_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ PyObject *self;
+ EventQueueRef itself;
+ char *kw[] = {"itself", 0};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, EventQueueRef_Convert, &itself)) return NULL;
+ if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ ((EventQueueRefObject *)self)->ob_itself = itself;
+ return self;
+ }
+
+ #define EventQueueRef_tp_free PyObject_Del
+
PyTypeObject EventQueueRef_Type = {
***************
*** 631,647 ****
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*outputHook_tp_as_buffer*/
! 0, /*outputHook_tp_flags*/
! 0, /*outputHook_tp_doc*/
! 0, /*outputHook_tp_traverse*/
! 0, /*outputHook_tp_clear*/
! 0, /*outputHook_tp_richcompare*/
! 0, /*outputHook_tp_weaklistoffset*/
! 0, /*outputHook_tp_iter*/
! 0, /*outputHook_tp_iternext*/
EventQueueRef_methods, /* tp_methods */
! 0, /*outputHook_tp_members*/
EventQueueRef_getsetlist, /*tp_getset*/
! 0, /*outputHook_tp_base*/
};
--- 677,701 ----
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*tp_as_buffer*/
! Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
! 0, /*tp_doc*/
! 0, /*tp_traverse*/
! 0, /*tp_clear*/
! 0, /*tp_richcompare*/
! 0, /*tp_weaklistoffset*/
! 0, /*tp_iter*/
! 0, /*tp_iternext*/
EventQueueRef_methods, /* tp_methods */
! 0, /*tp_members*/
EventQueueRef_getsetlist, /*tp_getset*/
! 0, /*tp_base*/
! 0, /*tp_dict*/
! 0, /*tp_descr_get*/
! 0, /*tp_descr_set*/
! 0, /*tp_dictoffset*/
! EventQueueRef_tp_init, /* tp_init */
! EventQueueRef_tp_alloc, /* tp_alloc */
! EventQueueRef_tp_new, /* tp_new */
! EventQueueRef_tp_free, /* tp_free */
};
***************
*** 706,709 ****
--- 760,764 ----
#define EventLoopRef_getsetlist NULL
+
#define EventLoopRef_compare NULL
***************
*** 711,714 ****
--- 766,787 ----
#define EventLoopRef_hash NULL
+ #define EventLoopRef_tp_init 0
+
+ #define EventLoopRef_tp_alloc PyType_GenericAlloc
+
+ static PyObject *EventLoopRef_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ PyObject *self;
+ EventLoopRef itself;
+ char *kw[] = {"itself", 0};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, EventLoopRef_Convert, &itself)) return NULL;
+ if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ ((EventLoopRefObject *)self)->ob_itself = itself;
+ return self;
+ }
+
+ #define EventLoopRef_tp_free PyObject_Del
+
PyTypeObject EventLoopRef_Type = {
***************
*** 733,749 ****
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*outputHook_tp_as_buffer*/
! 0, /*outputHook_tp_flags*/
! 0, /*outputHook_tp_doc*/
! 0, /*outputHook_tp_traverse*/
! 0, /*outputHook_tp_clear*/
! 0, /*outputHook_tp_richcompare*/
! 0, /*outputHook_tp_weaklistoffset*/
! 0, /*outputHook_tp_iter*/
! 0, /*outputHook_tp_iternext*/
EventLoopRef_methods, /* tp_methods */
! 0, /*outputHook_tp_members*/
EventLoopRef_getsetlist, /*tp_getset*/
! 0, /*outputHook_tp_base*/
};
--- 806,830 ----
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*tp_as_buffer*/
! Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
! 0, /*tp_doc*/
! 0, /*tp_traverse*/
! 0, /*tp_clear*/
! 0, /*tp_richcompare*/
! 0, /*tp_weaklistoffset*/
! 0, /*tp_iter*/
! 0, /*tp_iternext*/
EventLoopRef_methods, /* tp_methods */
! 0, /*tp_members*/
EventLoopRef_getsetlist, /*tp_getset*/
! 0, /*tp_base*/
! 0, /*tp_dict*/
! 0, /*tp_descr_get*/
! 0, /*tp_descr_set*/
! 0, /*tp_dictoffset*/
! EventLoopRef_tp_init, /* tp_init */
! EventLoopRef_tp_alloc, /* tp_alloc */
! EventLoopRef_tp_new, /* tp_new */
! EventLoopRef_tp_free, /* tp_free */
};
***************
*** 826,829 ****
--- 907,911 ----
#define EventLoopTimerRef_getsetlist NULL
+
#define EventLoopTimerRef_compare NULL
***************
*** 831,834 ****
--- 913,934 ----
#define EventLoopTimerRef_hash NULL
+ #define EventLoopTimerRef_tp_init 0
+
+ #define EventLoopTimerRef_tp_alloc PyType_GenericAlloc
+
+ static PyObject *EventLoopTimerRef_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ PyObject *self;
+ EventLoopTimerRef itself;
+ char *kw[] = {"itself", 0};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, EventLoopTimerRef_Convert, &itself)) return NULL;
+ if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ ((EventLoopTimerRefObject *)self)->ob_itself = itself;
+ return self;
+ }
+
+ #define EventLoopTimerRef_tp_free PyObject_Del
+
PyTypeObject EventLoopTimerRef_Type = {
***************
*** 853,869 ****
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*outputHook_tp_as_buffer*/
! 0, /*outputHook_tp_flags*/
! 0, /*outputHook_tp_doc*/
! 0, /*outputHook_tp_traverse*/
! 0, /*outputHook_tp_clear*/
! 0, /*outputHook_tp_richcompare*/
! 0, /*outputHook_tp_weaklistoffset*/
! 0, /*outputHook_tp_iter*/
! 0, /*outputHook_tp_iternext*/
EventLoopTimerRef_methods, /* tp_methods */
! 0, /*outputHook_tp_members*/
EventLoopTimerRef_getsetlist, /*tp_getset*/
! 0, /*outputHook_tp_base*/
};
--- 953,977 ----
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*tp_as_buffer*/
! Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
! 0, /*tp_doc*/
! 0, /*tp_traverse*/
! 0, /*tp_clear*/
! 0, /*tp_richcompare*/
! 0, /*tp_weaklistoffset*/
! 0, /*tp_iter*/
! 0, /*tp_iternext*/
EventLoopTimerRef_methods, /* tp_methods */
! 0, /*tp_members*/
EventLoopTimerRef_getsetlist, /*tp_getset*/
! 0, /*tp_base*/
! 0, /*tp_dict*/
! 0, /*tp_descr_get*/
! 0, /*tp_descr_set*/
! 0, /*tp_dictoffset*/
! EventLoopTimerRef_tp_init, /* tp_init */
! EventLoopTimerRef_tp_alloc, /* tp_alloc */
! EventLoopTimerRef_tp_new, /* tp_new */
! EventLoopTimerRef_tp_free, /* tp_free */
};
***************
*** 991,994 ****
--- 1099,1103 ----
#define EventHandlerRef_getsetlist NULL
+
#define EventHandlerRef_compare NULL
***************
*** 996,999 ****
--- 1105,1126 ----
#define EventHandlerRef_hash NULL
+ #define EventHandlerRef_tp_init 0
+
+ #define EventHandlerRef_tp_alloc PyType_GenericAlloc
+
+ static PyObject *EventHandlerRef_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ PyObject *self;
+ EventHandlerRef itself;
+ char *kw[] = {"itself", 0};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, EventHandlerRef_Convert, &itself)) return NULL;
+ if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ ((EventHandlerRefObject *)self)->ob_itself = itself;
+ return self;
+ }
+
+ #define EventHandlerRef_tp_free PyObject_Del
+
PyTypeObject EventHandlerRef_Type = {
***************
*** 1018,1034 ****
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*outputHook_tp_as_buffer*/
! 0, /*outputHook_tp_flags*/
! 0, /*outputHook_tp_doc*/
! 0, /*outputHook_tp_traverse*/
! 0, /*outputHook_tp_clear*/
! 0, /*outputHook_tp_richcompare*/
! 0, /*outputHook_tp_weaklistoffset*/
! 0, /*outputHook_tp_iter*/
! 0, /*outputHook_tp_iternext*/
EventHandlerRef_methods, /* tp_methods */
! 0, /*outputHook_tp_members*/
EventHandlerRef_getsetlist, /*tp_getset*/
! 0, /*outputHook_tp_base*/
};
--- 1145,1169 ----
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*tp_as_buffer*/
! Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
! 0, /*tp_doc*/
! 0, /*tp_traverse*/
! 0, /*tp_clear*/
! 0, /*tp_richcompare*/
! 0, /*tp_weaklistoffset*/
! 0, /*tp_iter*/
! 0, /*tp_iternext*/
EventHandlerRef_methods, /* tp_methods */
! 0, /*tp_members*/
EventHandlerRef_getsetlist, /*tp_getset*/
! 0, /*tp_base*/
! 0, /*tp_dict*/
! 0, /*tp_descr_get*/
! 0, /*tp_descr_set*/
! 0, /*tp_dictoffset*/
! EventHandlerRef_tp_init, /* tp_init */
! EventHandlerRef_tp_alloc, /* tp_alloc */
! EventHandlerRef_tp_new, /* tp_new */
! EventHandlerRef_tp_free, /* tp_free */
};
***************
*** 1096,1099 ****
--- 1231,1235 ----
#define EventHandlerCallRef_getsetlist NULL
+
#define EventHandlerCallRef_compare NULL
***************
*** 1101,1104 ****
--- 1237,1258 ----
#define EventHandlerCallRef_hash NULL
+ #define EventHandlerCallRef_tp_init 0
+
+ #define EventHandlerCallRef_tp_alloc PyType_GenericAlloc
+
+ static PyObject *EventHandlerCallRef_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ PyObject *self;
+ EventHandlerCallRef itself;
+ char *kw[] = {"itself", 0};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, EventHandlerCallRef_Convert, &itself)) return NULL;
+ if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ ((EventHandlerCallRefObject *)self)->ob_itself = itself;
+ return self;
+ }
+
+ #define EventHandlerCallRef_tp_free PyObject_Del
+
PyTypeObject EventHandlerCallRef_Type = {
***************
*** 1123,1139 ****
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*outputHook_tp_as_buffer*/
! 0, /*outputHook_tp_flags*/
! 0, /*outputHook_tp_doc*/
! 0, /*outputHook_tp_traverse*/
! 0, /*outputHook_tp_clear*/
! 0, /*outputHook_tp_richcompare*/
! 0, /*outputHook_tp_weaklistoffset*/
! 0, /*outputHook_tp_iter*/
! 0, /*outputHook_tp_iternext*/
EventHandlerCallRef_methods, /* tp_methods */
! 0, /*outputHook_tp_members*/
EventHandlerCallRef_getsetlist, /*tp_getset*/
! 0, /*outputHook_tp_base*/
};
--- 1277,1301 ----
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*tp_as_buffer*/
! Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
! 0, /*tp_doc*/
! 0, /*tp_traverse*/
! 0, /*tp_clear*/
! 0, /*tp_richcompare*/
! 0, /*tp_weaklistoffset*/
! 0, /*tp_iter*/
! 0, /*tp_iternext*/
EventHandlerCallRef_methods, /* tp_methods */
! 0, /*tp_members*/
EventHandlerCallRef_getsetlist, /*tp_getset*/
! 0, /*tp_base*/
! 0, /*tp_dict*/
! 0, /*tp_descr_get*/
! 0, /*tp_descr_set*/
! 0, /*tp_dictoffset*/
! EventHandlerCallRef_tp_init, /* tp_init */
! EventHandlerCallRef_tp_alloc, /* tp_alloc */
! EventHandlerCallRef_tp_new, /* tp_new */
! EventHandlerCallRef_tp_free, /* tp_free */
};
***************
*** 1223,1226 ****
--- 1385,1389 ----
#define EventTargetRef_getsetlist NULL
+
#define EventTargetRef_compare NULL
***************
*** 1228,1231 ****
--- 1391,1412 ----
#define EventTargetRef_hash NULL
+ #define EventTargetRef_tp_init 0
+
+ #define EventTargetRef_tp_alloc PyType_GenericAlloc
+
+ static PyObject *EventTargetRef_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ PyObject *self;
+ EventTargetRef itself;
+ char *kw[] = {"itself", 0};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, EventTargetRef_Convert, &itself)) return NULL;
+ if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ ((EventTargetRefObject *)self)->ob_itself = itself;
+ return self;
+ }
+
+ #define EventTargetRef_tp_free PyObject_Del
+
PyTypeObject EventTargetRef_Type = {
***************
*** 1250,1266 ****
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*outputHook_tp_as_buffer*/
! 0, /*outputHook_tp_flags*/
! 0, /*outputHook_tp_doc*/
! 0, /*outputHook_tp_traverse*/
! 0, /*outputHook_tp_clear*/
! 0, /*outputHook_tp_richcompare*/
! 0, /*outputHook_tp_weaklistoffset*/
! 0, /*outputHook_tp_iter*/
! 0, /*outputHook_tp_iternext*/
EventTargetRef_methods, /* tp_methods */
! 0, /*outputHook_tp_members*/
EventTargetRef_getsetlist, /*tp_getset*/
! 0, /*outputHook_tp_base*/
};
--- 1431,1455 ----
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*tp_as_buffer*/
! Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
! 0, /*tp_doc*/
! 0, /*tp_traverse*/
! 0, /*tp_clear*/
! 0, /*tp_richcompare*/
! 0, /*tp_weaklistoffset*/
! 0, /*tp_iter*/
! 0, /*tp_iternext*/
EventTargetRef_methods, /* tp_methods */
! 0, /*tp_members*/
EventTargetRef_getsetlist, /*tp_getset*/
! 0, /*tp_base*/
! 0, /*tp_dict*/
! 0, /*tp_descr_get*/
! 0, /*tp_descr_set*/
! 0, /*tp_dictoffset*/
! EventTargetRef_tp_init, /* tp_init */
! EventTargetRef_tp_alloc, /* tp_alloc */
! EventTargetRef_tp_new, /* tp_new */
! EventTargetRef_tp_free, /* tp_free */
};
***************
*** 1325,1328 ****
--- 1514,1518 ----
#define EventHotKeyRef_getsetlist NULL
+
#define EventHotKeyRef_compare NULL
***************
*** 1330,1333 ****
--- 1520,1541 ----
#define EventHotKeyRef_hash NULL
+ #define EventHotKeyRef_tp_init 0
+
+ #define EventHotKeyRef_tp_alloc PyType_GenericAlloc
+
+ static PyObject *EventHotKeyRef_tp_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+ {
+ PyObject *self;
+ EventHotKeyRef itself;
+ char *kw[] = {"itself", 0};
+
+ if (!PyArg_ParseTupleAndKeywords(args, kwds, "O&", kw, EventHotKeyRef_Convert, &itself)) return NULL;
+ if ((self = type->tp_alloc(type, 0)) == NULL) return NULL;
+ ((EventHotKeyRefObject *)self)->ob_itself = itself;
+ return self;
+ }
+
+ #define EventHotKeyRef_tp_free PyObject_Del
+
PyTypeObject EventHotKeyRef_Type = {
***************
*** 1352,1368 ****
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*outputHook_tp_as_buffer*/
! 0, /*outputHook_tp_flags*/
! 0, /*outputHook_tp_doc*/
! 0, /*outputHook_tp_traverse*/
! 0, /*outputHook_tp_clear*/
! 0, /*outputHook_tp_richcompare*/
! 0, /*outputHook_tp_weaklistoffset*/
! 0, /*outputHook_tp_iter*/
! 0, /*outputHook_tp_iternext*/
EventHotKeyRef_methods, /* tp_methods */
! 0, /*outputHook_tp_members*/
EventHotKeyRef_getsetlist, /*tp_getset*/
! 0, /*outputHook_tp_base*/
};
--- 1560,1584 ----
PyObject_GenericGetAttr, /*tp_getattro*/
PyObject_GenericSetAttr, /*tp_setattro */
! 0, /*tp_as_buffer*/
! Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, /* tp_flags */
! 0, /*tp_doc*/
! 0, /*tp_traverse*/
! 0, /*tp_clear*/
! 0, /*tp_richcompare*/
! 0, /*tp_weaklistoffset*/
! 0, /*tp_iter*/
! 0, /*tp_iternext*/
EventHotKeyRef_methods, /* tp_methods */
! 0, /*tp_members*/
EventHotKeyRef_getsetlist, /*tp_getset*/
! 0, /*tp_base*/
! 0, /*tp_dict*/
! 0, /*tp_descr_get*/
! 0, /*tp_descr_set*/
! 0, /*tp_dictoffset*/
! EventHotKeyRef_tp_init, /* tp_init */
! EventHotKeyRef_tp_alloc, /* tp_alloc */
! EventHotKeyRef_tp_new, /* tp_new */
! EventHotKeyRef_tp_free, /* tp_free */
};
***************
*** 1943,1976 ****
EventRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventRef_Type);
! if (PyDict_SetItemString(d, "EventRefType", (PyObject *)&EventRef_Type) != 0)
! Py_FatalError("can't initialize EventRefType");
EventQueueRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventQueueRef_Type);
! if (PyDict_SetItemString(d, "EventQueueRefType", (PyObject *)&EventQueueRef_Type) != 0)
! Py_FatalError("can't initialize EventQueueRefType");
EventLoopRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventLoopRef_Type);
! if (PyDict_SetItemString(d, "EventLoopRefType", (PyObject *)&EventLoopRef_Type) != 0)
! Py_FatalError("can't initialize EventLoopRefType");
EventLoopTimerRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventLoopTimerRef_Type);
! if (PyDict_SetItemString(d, "EventLoopTimerRefType", (PyObject *)&EventLoopTimerRef_Type) != 0)
! Py_FatalError("can't initialize EventLoopTimerRefType");
EventHandlerRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventHandlerRef_Type);
! if (PyDict_SetItemString(d, "EventHandlerRefType", (PyObject *)&EventHandlerRef_Type) != 0)
! Py_FatalError("can't initialize EventHandlerRefType");
EventHandlerCallRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventHandlerCallRef_Type);
! if (PyDict_SetItemString(d, "EventHandlerCallRefType", (PyObject *)&EventHandlerCallRef_Type) != 0)
! Py_FatalError("can't initialize EventHandlerCallRefType");
EventTargetRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventTargetRef_Type);
! if (PyDict_SetItemString(d, "EventTargetRefType", (PyObject *)&EventTargetRef_Type) != 0)
! Py_FatalError("can't initialize EventTargetRefType");
EventHotKeyRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventHotKeyRef_Type);
! if (PyDict_SetItemString(d, "EventHotKeyRefType", (PyObject *)&EventHotKeyRef_Type) != 0)
! Py_FatalError("can't initialize EventHotKeyRefType");
}
--- 2159,2208 ----
EventRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventRef_Type);
! PyModule_AddObject(m, "EventRef", (PyObject *)&EventRef_Type);
! /* Backward-compatible name */
! Py_INCREF(&EventRef_Type);
! PyModule_AddObject(m, "EventRefType", (PyObject *)&EventRef_Type);
EventQueueRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventQueueRef_Type);
! PyModule_AddObject(m, "EventQueueRef", (PyObject *)&EventQueueRef_Type);
! /* Backward-compatible name */
! Py_INCREF(&EventQueueRef_Type);
! PyModule_AddObject(m, "EventQueueRefType", (PyObject *)&EventQueueRef_Type);
EventLoopRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventLoopRef_Type);
! PyModule_AddObject(m, "EventLoopRef", (PyObject *)&EventLoopRef_Type);
! /* Backward-compatible name */
! Py_INCREF(&EventLoopRef_Type);
! PyModule_AddObject(m, "EventLoopRefType", (PyObject *)&EventLoopRef_Type);
EventLoopTimerRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventLoopTimerRef_Type);
! PyModule_AddObject(m, "EventLoopTimerRef", (PyObject *)&EventLoopTimerRef_Type);
! /* Backward-compatible name */
! Py_INCREF(&EventLoopTimerRef_Type);
! PyModule_AddObject(m, "EventLoopTimerRefType", (PyObject *)&EventLoopTimerRef_Type);
EventHandlerRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventHandlerRef_Type);
! PyModule_AddObject(m, "EventHandlerRef", (PyObject *)&EventHandlerRef_Type);
! /* Backward-compatible name */
! Py_INCREF(&EventHandlerRef_Type);
! PyModule_AddObject(m, "EventHandlerRefType", (PyObject *)&EventHandlerRef_Type);
EventHandlerCallRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventHandlerCallRef_Type);
! PyModule_AddObject(m, "EventHandlerCallRef", (PyObject *)&EventHandlerCallRef_Type);
! /* Backward-compatible name */
! Py_INCREF(&EventHandlerCallRef_Type);
! PyModule_AddObject(m, "EventHandlerCallRefType", (PyObject *)&EventHandlerCallRef_Type);
EventTargetRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventTargetRef_Type);
! PyModule_AddObject(m, "EventTargetRef", (PyObject *)&EventTargetRef_Type);
! /* Backward-compatible name */
! Py_INCREF(&EventTargetRef_Type);
! PyModule_AddObject(m, "EventTargetRefType", (PyObject *)&EventTargetRef_Type);
EventHotKeyRef_Type.ob_type = &PyType_Type;
Py_INCREF(&EventHotKeyRef_Type);
! PyModule_AddObject(m, "EventHotKeyRef", (PyObject *)&EventHotKeyRef_Type);
! /* Backward-compatible name */
! Py_INCREF(&EventHotKeyRef_Type);
! PyModule_AddObject(m, "EventHotKeyRefType", (PyObject *)&EventHotKeyRef_Type);
}