mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-02 16:13:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Jack Jansen 2000-07-11 21:12:55 +00:00
parent 88887aa38e
commit 85152b93cb
2 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Mac/Modules/ctl/Ctlmodule.c
View file

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

12
Mac/Modules/ctl/ctlsupport.py
View file

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