@@ -33,24 +33,24 @@ static PyObject *App_Error;
3333
3434PyTypeObject ThemeDrawingState_Type ;
3535
36- #define ThemeDrawingState_Check (x ) ((x)->ob_type == &ThemeDrawingState_Type)
36+ #define ThemeDrawingStateObj_Check (x ) ((x)->ob_type == &ThemeDrawingState_Type)
3737
3838typedef struct ThemeDrawingStateObject {
3939 PyObject_HEAD
4040 ThemeDrawingState ob_itself ;
4141} ThemeDrawingStateObject ;
4242
43- PyObject * ThemeDrawingState_New (ThemeDrawingState itself )
43+ PyObject * ThemeDrawingStateObj_New (ThemeDrawingState itself )
4444{
4545 ThemeDrawingStateObject * it ;
4646 it = PyObject_NEW (ThemeDrawingStateObject , & ThemeDrawingState_Type );
4747 if (it == NULL ) return NULL ;
4848 it -> ob_itself = itself ;
4949 return (PyObject * )it ;
5050}
51- int ThemeDrawingState_Convert (PyObject * v , ThemeDrawingState * p_itself )
51+ int ThemeDrawingStateObj_Convert (PyObject * v , ThemeDrawingState * p_itself )
5252{
53- if (!ThemeDrawingState_Check (v ))
53+ if (!ThemeDrawingStateObj_Check (v ))
5454 {
5555 PyErr_SetString (PyExc_TypeError , "ThemeDrawingState required" );
5656 return 0 ;
@@ -59,13 +59,13 @@ int ThemeDrawingState_Convert(PyObject *v, ThemeDrawingState *p_itself)
5959 return 1 ;
6060}
6161
62- static void ThemeDrawingState_dealloc (ThemeDrawingStateObject * self )
62+ static void ThemeDrawingStateObj_dealloc (ThemeDrawingStateObject * self )
6363{
6464 /* Cleanup of self->ob_itself goes here */
6565 PyMem_DEL (self );
6666}
6767
68- static PyObject * ThemeDrawingState_SetThemeDrawingState (ThemeDrawingStateObject * _self , PyObject * _args )
68+ static PyObject * ThemeDrawingStateObj_SetThemeDrawingState (ThemeDrawingStateObject * _self , PyObject * _args )
6969{
7070 PyObject * _res = NULL ;
7171 OSStatus _rv ;
@@ -80,7 +80,7 @@ static PyObject *ThemeDrawingState_SetThemeDrawingState(ThemeDrawingStateObject
8080 return _res ;
8181}
8282
83- static PyObject * ThemeDrawingState_DisposeThemeDrawingState (ThemeDrawingStateObject * _self , PyObject * _args )
83+ static PyObject * ThemeDrawingStateObj_DisposeThemeDrawingState (ThemeDrawingStateObject * _self , PyObject * _args )
8484{
8585 PyObject * _res = NULL ;
8686 OSStatus _rv ;
@@ -92,28 +92,28 @@ static PyObject *ThemeDrawingState_DisposeThemeDrawingState(ThemeDrawingStateObj
9292 return _res ;
9393}
9494
95- static PyMethodDef ThemeDrawingState_methods [] = {
96- {"SetThemeDrawingState" , (PyCFunction )ThemeDrawingState_SetThemeDrawingState , 1 ,
95+ static PyMethodDef ThemeDrawingStateObj_methods [] = {
96+ {"SetThemeDrawingState" , (PyCFunction )ThemeDrawingStateObj_SetThemeDrawingState , 1 ,
9797 "(Boolean inDisposeNow) -> (OSStatus _rv)" },
98- {"DisposeThemeDrawingState" , (PyCFunction )ThemeDrawingState_DisposeThemeDrawingState , 1 ,
98+ {"DisposeThemeDrawingState" , (PyCFunction )ThemeDrawingStateObj_DisposeThemeDrawingState , 1 ,
9999 "() -> (OSStatus _rv)" },
100100 {NULL , NULL , 0 }
101101};
102102
103- PyMethodChain ThemeDrawingState_chain = { ThemeDrawingState_methods , NULL };
103+ PyMethodChain ThemeDrawingStateObj_chain = { ThemeDrawingStateObj_methods , NULL };
104104
105- static PyObject * ThemeDrawingState_getattr (ThemeDrawingStateObject * self , char * name )
105+ static PyObject * ThemeDrawingStateObj_getattr (ThemeDrawingStateObject * self , char * name )
106106{
107- return Py_FindMethodInChain (& ThemeDrawingState_chain , (PyObject * )self , name );
107+ return Py_FindMethodInChain (& ThemeDrawingStateObj_chain , (PyObject * )self , name );
108108}
109109
110- #define ThemeDrawingState_setattr NULL
110+ #define ThemeDrawingStateObj_setattr NULL
111111
112- #define ThemeDrawingState_compare NULL
112+ #define ThemeDrawingStateObj_compare NULL
113113
114- #define ThemeDrawingState_repr NULL
114+ #define ThemeDrawingStateObj_repr NULL
115115
116- #define ThemeDrawingState_hash NULL
116+ #define ThemeDrawingStateObj_hash NULL
117117
118118PyTypeObject ThemeDrawingState_Type = {
119119 PyObject_HEAD_INIT (NULL )
@@ -122,16 +122,16 @@ PyTypeObject ThemeDrawingState_Type = {
122122 sizeof (ThemeDrawingStateObject ), /*tp_basicsize*/
123123 0 , /*tp_itemsize*/
124124 /* methods */
125- (destructor ) ThemeDrawingState_dealloc , /*tp_dealloc*/
125+ (destructor ) ThemeDrawingStateObj_dealloc , /*tp_dealloc*/
126126 0 , /*tp_print*/
127- (getattrfunc ) ThemeDrawingState_getattr , /*tp_getattr*/
128- (setattrfunc ) ThemeDrawingState_setattr , /*tp_setattr*/
129- (cmpfunc ) ThemeDrawingState_compare , /*tp_compare*/
130- (reprfunc ) ThemeDrawingState_repr , /*tp_repr*/
127+ (getattrfunc ) ThemeDrawingStateObj_getattr , /*tp_getattr*/
128+ (setattrfunc ) ThemeDrawingStateObj_setattr , /*tp_setattr*/
129+ (cmpfunc ) ThemeDrawingStateObj_compare , /*tp_compare*/
130+ (reprfunc ) ThemeDrawingStateObj_repr , /*tp_repr*/
131131 (PyNumberMethods * )0 , /* tp_as_number */
132132 (PySequenceMethods * )0 , /* tp_as_sequence */
133133 (PyMappingMethods * )0 , /* tp_as_mapping */
134- (hashfunc ) ThemeDrawingState_hash , /*tp_hash*/
134+ (hashfunc ) ThemeDrawingStateObj_hash , /*tp_hash*/
135135};
136136
137137/* --------------- End object type ThemeDrawingState ---------------- */
@@ -1151,7 +1151,7 @@ static PyObject *App_GetThemeDrawingState(PyObject *_self, PyObject *_args)
11511151 _err = GetThemeDrawingState (& outState );
11521152 if (_err != noErr ) return PyMac_Error (_err );
11531153 _res = Py_BuildValue ("O&" ,
1154- ThemeDrawingState_New , outState );
1154+ ThemeDrawingStateObj_New , outState );
11551155 return _res ;
11561156}
11571157
0 commit comments