Fiddled declaration/implementation of setcallback() so that it is ansifyable.

diff --git a/Mac/Modules/ctl/Ctlmodule.c b/Mac/Modules/ctl/Ctlmodule.c
index cafe0d6645f94c5556e896f9c25503d27d5255d1..863276773b266feef0d9fd63e4681c647a6fcca0 100644 (file)
--- a/Mac/Modules/ctl/Ctlmodule.c
+++ b/Mac/Modules/ctl/Ctlmodule.c
@@ -93,6 +93,9 @@ static ControlUserPaneTrackingUPP mytrackingproc_upp;
 
 extern int settrackfunc(PyObject *);   /* forward */
 extern void clrtrackfunc(void);        /* forward */
+#ifndef TARGET_API_MAC_CARBON_NOTYET
+staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
+#endif
 
 static PyObject *Ctl_Error;
 
@@ -1441,7 +1444,7 @@ static PyObject *CtlObj_SetControlDataCallback(_self, _args)
        ControlPartCode inPart;
        ResType inTagName;
        PyObject *callback;
-       UniversalProcPtr *c_callback;
+       UniversalProcPtr c_callback;
 
        if (!PyArg_ParseTuple(_args, "hO&O",
                              &inPart,
@@ -1449,7 +1452,7 @@ static PyObject *CtlObj_SetControlDataCallback(_self, _args)
                              &callback))
                return NULL;
 
-       if ( setcallback(_self, inTagName, callback, &c_callback) < 0 )
+       if ( setcallback((PyObject *)_self, inTagName, callback, &c_callback) < 0 )
                return NULL;
        _err = SetControlData(_self->ob_itself,
                              inPart,
@@ -2164,12 +2167,13 @@ mytracker(ControlHandle ctl, short part)
 
 #ifndef TARGET_API_MAC_CARBON_NOTYET
 static int
-setcallback(self, which, callback, uppp)
-       ControlObject *self;
+setcallback(myself, which, callback, uppp)
+       PyObject *myself;
        OSType which;
        PyObject *callback;
        UniversalProcPtr *uppp;
 {
+       ControlObject *self = (ControlObject *)myself;
        char keybuf[9];
        
        if ( which == kControlUserPaneDrawProcTag )

diff --git a/Mac/Modules/ctl/ctlsupport.py b/Mac/Modules/ctl/ctlsupport.py
index 0623400eb3abb0fc4481363875844be67e838084..30c44912d1a3ad48640d57994bfe11aff7ada7c7 100644 (file)
--- a/Mac/Modules/ctl/ctlsupport.py
+++ b/Mac/Modules/ctl/ctlsupport.py
@@ -93,6 +93,9 @@ static ControlUserPaneTrackingUPP mytrackingproc_upp;
 
 extern int settrackfunc(PyObject *);   /* forward */
 extern void clrtrackfunc(void);        /* forward */
+#ifndef TARGET_API_MAC_CARBON_NOTYET
+staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
+#endif
 """
 
 finalstuff = finalstuff + """
@@ -165,12 +168,13 @@ mytracker(ControlHandle ctl, short part)
 
 #ifndef TARGET_API_MAC_CARBON_NOTYET
 static int
-setcallback(self, which, callback, uppp)
-       ControlObject *self;
+setcallback(myself, which, callback, uppp)
+       PyObject *myself;
        OSType which;
        PyObject *callback;
        UniversalProcPtr *uppp;
 {
+       ControlObject *self = (ControlObject *)myself;
        char keybuf[9];
        
        if ( which == kControlUserPaneDrawProcTag )
@@ -544,7 +548,7 @@ OSErr _err;
 ControlPartCode inPart;
 ResType inTagName;
 PyObject *callback;
-UniversalProcPtr *c_callback;
+UniversalProcPtr c_callback;
 
 if (!PyArg_ParseTuple(_args, "hO&O",
                       &inPart,
@@ -552,7 +556,7 @@ if (!PyArg_ParseTuple(_args, "hO&O",
                       &callback))
        return NULL;
 
-if ( setcallback(_self, inTagName, callback, &c_callback) < 0 )
+if ( setcallback((PyObject *)_self, inTagName, callback, &c_callback) < 0 )
        return NULL;
 _err = SetControlData(_self->ob_itself,
                      inPart,