@@ -735,8 +735,9 @@ newPyTclObject(Tcl_Obj *arg)
735
735
}
736
736
737
737
static void
738
- PyTclObject_dealloc (PyTclObject * self )
738
+ PyTclObject_dealloc (PyObject * _self )
739
739
{
740
+ PyTclObject * self = (PyTclObject * )_self ;
740
741
PyObject * tp = (PyObject * ) Py_TYPE (self );
741
742
Tcl_DecrRefCount (self -> value );
742
743
Py_XDECREF (self -> string );
@@ -749,8 +750,9 @@ PyDoc_STRVAR(PyTclObject_string__doc__,
749
750
"the string representation of this object, either as str or bytes" );
750
751
751
752
static PyObject *
752
- PyTclObject_string (PyTclObject * self , void * ignored )
753
+ PyTclObject_string (PyObject * _self , void * ignored )
753
754
{
755
+ PyTclObject * self = (PyTclObject * )_self ;
754
756
if (!self -> string ) {
755
757
self -> string = unicodeFromTclObj (self -> value );
756
758
if (!self -> string )
@@ -760,8 +762,9 @@ PyTclObject_string(PyTclObject *self, void *ignored)
760
762
}
761
763
762
764
static PyObject *
763
- PyTclObject_str (PyTclObject * self )
765
+ PyTclObject_str (PyObject * _self )
764
766
{
767
+ PyTclObject * self = (PyTclObject * )_self ;
765
768
if (self -> string ) {
766
769
return Py_NewRef (self -> string );
767
770
}
@@ -770,9 +773,10 @@ PyTclObject_str(PyTclObject *self)
770
773
}
771
774
772
775
static PyObject *
773
- PyTclObject_repr (PyTclObject * self )
776
+ PyTclObject_repr (PyObject * _self )
774
777
{
775
- PyObject * repr , * str = PyTclObject_str (self );
778
+ PyTclObject * self = (PyTclObject * )_self ;
779
+ PyObject * repr , * str = PyTclObject_str (_self );
776
780
if (str == NULL )
777
781
return NULL ;
778
782
repr = PyUnicode_FromFormat ("<%s object: %R>" ,
@@ -809,23 +813,24 @@ PyTclObject_richcompare(PyObject *self, PyObject *other, int op)
809
813
PyDoc_STRVAR (get_typename__doc__ , "name of the Tcl type" );
810
814
811
815
static PyObject *
812
- get_typename (PyTclObject * obj , void * ignored )
816
+ get_typename (PyObject * self , void * ignored )
813
817
{
818
+ PyTclObject * obj = (PyTclObject * )self ;
814
819
return unicodeFromTclString (obj -> value -> typePtr -> name );
815
820
}
816
821
817
822
818
823
static PyGetSetDef PyTclObject_getsetlist [] = {
819
- {"typename" , ( getter ) get_typename , NULL , get_typename__doc__ },
820
- {"string" , ( getter ) PyTclObject_string , NULL ,
824
+ {"typename" , get_typename , NULL , get_typename__doc__ },
825
+ {"string" , PyTclObject_string , NULL ,
821
826
PyTclObject_string__doc__ },
822
827
{0 },
823
828
};
824
829
825
830
static PyType_Slot PyTclObject_Type_slots [] = {
826
- {Py_tp_dealloc , ( destructor ) PyTclObject_dealloc },
827
- {Py_tp_repr , ( reprfunc ) PyTclObject_repr },
828
- {Py_tp_str , ( reprfunc ) PyTclObject_str },
831
+ {Py_tp_dealloc , PyTclObject_dealloc },
832
+ {Py_tp_repr , PyTclObject_repr },
833
+ {Py_tp_str , PyTclObject_str },
829
834
{Py_tp_getattro , PyObject_GenericGetAttr },
830
835
{Py_tp_richcompare , PyTclObject_richcompare },
831
836
{Py_tp_getset , PyTclObject_getsetlist },
@@ -1306,8 +1311,9 @@ Tkapp_ObjectResult(TkappObject *self)
1306
1311
hold the Python lock. */
1307
1312
1308
1313
static int
1309
- Tkapp_CallProc (Tkapp_CallEvent * e , int flags )
1314
+ Tkapp_CallProc (Tcl_Event * evPtr , int flags )
1310
1315
{
1316
+ Tkapp_CallEvent * e = (Tkapp_CallEvent * )evPtr ;
1311
1317
Tcl_Obj * objStore [ARGSZ ];
1312
1318
Tcl_Obj * * objv ;
1313
1319
int objc ;
@@ -1385,7 +1391,7 @@ Tkapp_Call(PyObject *selfptr, PyObject *args)
1385
1391
PyErr_NoMemory ();
1386
1392
return NULL ;
1387
1393
}
1388
- ev -> ev .proc = ( Tcl_EventProc * ) Tkapp_CallProc ;
1394
+ ev -> ev .proc = Tkapp_CallProc ;
1389
1395
ev -> self = self ;
1390
1396
ev -> args = args ;
1391
1397
ev -> res = & res ;
@@ -1624,8 +1630,9 @@ var_perform(VarEvent *ev)
1624
1630
}
1625
1631
1626
1632
static int
1627
- var_proc (VarEvent * ev , int flags )
1633
+ var_proc (Tcl_Event * evPtr , int flags )
1628
1634
{
1635
+ VarEvent * ev = (VarEvent * )evPtr ;
1629
1636
ENTER_PYTHON
1630
1637
var_perform (ev );
1631
1638
Tcl_MutexLock (& var_mutex );
@@ -1663,7 +1670,7 @@ var_invoke(EventFunc func, PyObject *selfptr, PyObject *args, int flags)
1663
1670
ev -> res = & res ;
1664
1671
ev -> exc = & exc ;
1665
1672
ev -> cond = & cond ;
1666
- ev -> ev .proc = ( Tcl_EventProc * ) var_proc ;
1673
+ ev -> ev .proc = var_proc ;
1667
1674
Tkapp_ThreadSend (self , (Tcl_Event * )ev , & cond , & var_mutex );
1668
1675
Tcl_ConditionFinalize (& cond );
1669
1676
if (!res ) {
@@ -2236,8 +2243,9 @@ typedef struct CommandEvent{
2236
2243
} CommandEvent ;
2237
2244
2238
2245
static int
2239
- Tkapp_CommandProc (CommandEvent * ev , int flags )
2246
+ Tkapp_CommandProc (Tcl_Event * evPtr , int flags )
2240
2247
{
2248
+ CommandEvent * ev = (CommandEvent * )evPtr ;
2241
2249
if (ev -> create )
2242
2250
* ev -> status = Tcl_CreateObjCommand (
2243
2251
ev -> interp , ev -> name , PythonCmd ,
@@ -2290,7 +2298,7 @@ _tkinter_tkapp_createcommand_impl(TkappObject *self, const char *name,
2290
2298
PyMem_Free (data );
2291
2299
return NULL ;
2292
2300
}
2293
- ev -> ev .proc = ( Tcl_EventProc * ) Tkapp_CommandProc ;
2301
+ ev -> ev .proc = Tkapp_CommandProc ;
2294
2302
ev -> interp = self -> interp ;
2295
2303
ev -> create = 1 ;
2296
2304
ev -> name = name ;
@@ -2343,7 +2351,7 @@ _tkinter_tkapp_deletecommand_impl(TkappObject *self, const char *name)
2343
2351
PyErr_NoMemory ();
2344
2352
return NULL ;
2345
2353
}
2346
- ev -> ev .proc = ( Tcl_EventProc * ) Tkapp_CommandProc ;
2354
+ ev -> ev .proc = Tkapp_CommandProc ;
2347
2355
ev -> interp = self -> interp ;
2348
2356
ev -> create = 0 ;
2349
2357
ev -> name = name ;
0 commit comments