traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use extern when we mean staticforward (OSX gcc is picky about it). 

Blacklist SendControlMessage: it's signature has changed between Universal Headers 3.3 and 3.4.
This commit is contained in:
Jack Jansen 2001-06-20 21:31:28 +00:00
parent f1927a6d80
commit b8248d8cff
3 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Mac/Modules/ctl/Ctlmodule.c
View File

@ -81,8 +81,8 @@ static ControlUserPaneIdleUPP myidleproc_upp;
static ControlUserPaneHitTestUPP myhittestproc_upp; static ControlUserPaneHitTestUPP myhittestproc_upp;
static ControlUserPaneTrackingUPP mytrackingproc_upp; static ControlUserPaneTrackingUPP mytrackingproc_upp;
extern int settrackfunc(PyObject *); /* forward */ staticforward int settrackfunc(PyObject *); /* forward */
extern void clrtrackfunc(void); /* forward */ staticforward void clrtrackfunc(void); /* forward */
staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *); staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
static PyObject *Ctl_Error; static PyObject *Ctl_Error;
@ -910,24 +910,6 @@ static PyObject *CtlObj_SetControlColor(ControlObject *_self, PyObject *_args)
} }
#endif #endif
static PyObject *CtlObj_SendControlMessage(ControlObject *_self, PyObject *_args)
{
PyObject *_res = NULL;
SInt32 _rv;
SInt16 inMessage;
SInt32 inParam;
if (!PyArg_ParseTuple(_args, "hl",
&inMessage,
&inParam))
return NULL;
_rv = SendControlMessage(_self->ob_itself,
inMessage,
inParam);
_res = Py_BuildValue("l",
_rv);
return _res;
}
static PyObject *CtlObj_EmbedControl(ControlObject *_self, PyObject *_args) static PyObject *CtlObj_EmbedControl(ControlObject *_self, PyObject *_args)
{ {
PyObject *_res = NULL; PyObject *_res = NULL;
@ -1895,8 +1877,6 @@ static PyMethodDef CtlObj_methods[] = {
{"SetControlColor", (PyCFunction)CtlObj_SetControlColor, 1, {"SetControlColor", (PyCFunction)CtlObj_SetControlColor, 1,
"(CCTabHandle newColorTable) -> None"}, "(CCTabHandle newColorTable) -> None"},
#endif #endif
{"SendControlMessage", (PyCFunction)CtlObj_SendControlMessage, 1,
"(SInt16 inMessage, SInt32 inParam) -> (SInt32 _rv)"},
{"EmbedControl", (PyCFunction)CtlObj_EmbedControl, 1, {"EmbedControl", (PyCFunction)CtlObj_EmbedControl, 1,
"(ControlHandle inContainer) -> None"}, "(ControlHandle inContainer) -> None"},
{"AutoEmbedControl", (PyCFunction)CtlObj_AutoEmbedControl, 1, {"AutoEmbedControl", (PyCFunction)CtlObj_AutoEmbedControl, 1,

1
Mac/Modules/ctl/ctlscan.py
View File

@ -79,6 +79,7 @@ class MyScanner(Scanner):
'GetControlProperty', 'GetControlProperty',
'SetControlProperty', 'SetControlProperty',
'GetControlPropertySize', 'GetControlPropertySize',
'SendControlMessage', # Parameter changed from long to void* from UH3.3 to UH3.4
] ]
def makegreylist(self): def makegreylist(self):

4
Mac/Modules/ctl/ctlsupport.py
View File

@ -122,8 +122,8 @@ static ControlUserPaneIdleUPP myidleproc_upp;
static ControlUserPaneHitTestUPP myhittestproc_upp; static ControlUserPaneHitTestUPP myhittestproc_upp;
static ControlUserPaneTrackingUPP mytrackingproc_upp; static ControlUserPaneTrackingUPP mytrackingproc_upp;
extern int settrackfunc(PyObject *); /* forward */ staticforward int settrackfunc(PyObject *); /* forward */
extern void clrtrackfunc(void); /* forward */ staticforward void clrtrackfunc(void); /* forward */
staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *); staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
""" """