mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SetpopupData and GetPopupData are gone under Carbon, use {Get,Set}PopupMenu{Handle,ID} in stead. 

The UserPane routines appear to be fixed in the current Universal Headers, so they're re-enabled.
This commit is contained in:
Jack Jansen 2001-01-12 23:39:00 +00:00
parent d9d0b5fab1
commit 736b51df7c
2 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,18 +72,14 @@ PyControlID_Convert(v, itself)
/* TrackControl and HandleControlClick callback support */ /* TrackControl and HandleControlClick callback support */
static PyObject *tracker; static PyObject *tracker;
static ControlActionUPP mytracker_upp; static ControlActionUPP mytracker_upp;
#if !TARGET_API_MAC_CARBON_NOTYET
static ControlUserPaneDrawUPP mydrawproc_upp; static ControlUserPaneDrawUPP mydrawproc_upp;
static ControlUserPaneIdleUPP myidleproc_upp; static ControlUserPaneIdleUPP myidleproc_upp;
static ControlUserPaneHitTestUPP myhittestproc_upp; static ControlUserPaneHitTestUPP myhittestproc_upp;
static ControlUserPaneTrackingUPP mytrackingproc_upp; static ControlUserPaneTrackingUPP mytrackingproc_upp;
#endif
extern int settrackfunc(PyObject *); /* forward */ extern int settrackfunc(PyObject *); /* forward */
extern void clrtrackfunc(void); /* forward */ extern void clrtrackfunc(void); /* forward */
#if !TARGET_API_MAC_CARBON_NOTYET
staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *); staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
#endif
static PyObject *Ctl_Error; static PyObject *Ctl_Error;
@ -1876,8 +1872,6 @@ static PyObject *CtlObj_GetControlData_Handle(_self, _args)
} }
#if !TARGET_API_MAC_CARBON_NOTYET
static PyObject *CtlObj_SetControlData_Callback(_self, _args) static PyObject *CtlObj_SetControlData_Callback(_self, _args)
ControlObject *_self; ControlObject *_self;
PyObject *_args; PyObject *_args;
@ -1910,9 +1904,8 @@ static PyObject *CtlObj_SetControlData_Callback(_self, _args)
return _res; return _res;
} }
#endif
#if !TARGET_API_MAC_CARBON_NOTYET #if !TARGET_API_MAC_CARBON
static PyObject *CtlObj_GetPopupData(_self, _args) static PyObject *CtlObj_GetPopupData(_self, _args)
ControlObject *_self; ControlObject *_self;
@ -1935,7 +1928,7 @@ static PyObject *CtlObj_GetPopupData(_self, _args)
} }
#endif #endif
#if !TARGET_API_MAC_CARBON_NOTYET #if !TARGET_API_MAC_CARBON
static PyObject *CtlObj_SetPopupData(_self, _args) static PyObject *CtlObj_SetPopupData(_self, _args)
ControlObject *_self; ControlObject *_self;
@ -2217,18 +2210,15 @@ static PyMethodDef CtlObj_methods[] = {
"(ResObj) -> None"}, "(ResObj) -> None"},
{"GetControlData_Handle", (PyCFunction)CtlObj_GetControlData_Handle, 1, {"GetControlData_Handle", (PyCFunction)CtlObj_GetControlData_Handle, 1,
"(part, type) -> ResObj"}, "(part, type) -> ResObj"},
#if !TARGET_API_MAC_CARBON_NOTYET
{"SetControlData_Callback", (PyCFunction)CtlObj_SetControlData_Callback, 1, {"SetControlData_Callback", (PyCFunction)CtlObj_SetControlData_Callback, 1,
"(callbackfunc) -> None"}, "(callbackfunc) -> None"},
#endif
#if !TARGET_API_MAC_CARBON_NOTYET #if !TARGET_API_MAC_CARBON
{"GetPopupData", (PyCFunction)CtlObj_GetPopupData, 1, {"GetPopupData", (PyCFunction)CtlObj_GetPopupData, 1,
NULL}, NULL},
#endif #endif
#if !TARGET_API_MAC_CARBON_NOTYET #if !TARGET_API_MAC_CARBON
{"SetPopupData", (PyCFunction)CtlObj_SetPopupData, 1, {"SetPopupData", (PyCFunction)CtlObj_SetPopupData, 1,
NULL}, NULL},
#endif #endif
@ -2805,7 +2795,6 @@ mytracker(ControlHandle ctl, short part)
PySys_WriteStderr("TrackControl or HandleControlClick: exception in tracker function\n"); PySys_WriteStderr("TrackControl or HandleControlClick: exception in tracker function\n");
} }
#if !TARGET_API_MAC_CARBON_NOTYET
static int static int
setcallback(myself, which, callback, uppp) setcallback(myself, which, callback, uppp)
PyObject *myself; PyObject *myself;
@ -2922,7 +2911,6 @@ mytrackingproc(ControlHandle control, Point startPt, ControlActionUPP actionProc
Py_XDECREF(rv); Py_XDECREF(rv);
return (ControlPartCode)c_rv; return (ControlPartCode)c_rv;
} }
#endif
void initCtl() void initCtl()
@ -2933,12 +2921,10 @@ void initCtl()
mytracker_upp = NewControlActionProc(mytracker); mytracker_upp = NewControlActionProc(mytracker);
#if !TARGET_API_MAC_CARBON_NOTYET
mydrawproc_upp = NewControlUserPaneDrawProc(mydrawproc); mydrawproc_upp = NewControlUserPaneDrawProc(mydrawproc);
myidleproc_upp = NewControlUserPaneIdleProc(myidleproc); myidleproc_upp = NewControlUserPaneIdleProc(myidleproc);
myhittestproc_upp = NewControlUserPaneHitTestProc(myhittestproc); myhittestproc_upp = NewControlUserPaneHitTestProc(myhittestproc);
mytrackingproc_upp = NewControlUserPaneTrackingProc(mytrackingproc); mytrackingproc_upp = NewControlUserPaneTrackingProc(mytrackingproc);
#endif
m = Py_InitModule("Ctl", Ctl_methods); m = Py_InitModule("Ctl", Ctl_methods);

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

@ -113,18 +113,14 @@
/* TrackControl and HandleControlClick callback support */ /* TrackControl and HandleControlClick callback support */
static PyObject *tracker; static PyObject *tracker;
static ControlActionUPP mytracker_upp; static ControlActionUPP mytracker_upp;
#if !TARGET_API_MAC_CARBON_NOTYET
static ControlUserPaneDrawUPP mydrawproc_upp; static ControlUserPaneDrawUPP mydrawproc_upp;
static ControlUserPaneIdleUPP myidleproc_upp; static ControlUserPaneIdleUPP myidleproc_upp;
static ControlUserPaneHitTestUPP myhittestproc_upp; static ControlUserPaneHitTestUPP myhittestproc_upp;
static ControlUserPaneTrackingUPP mytrackingproc_upp; static ControlUserPaneTrackingUPP mytrackingproc_upp;
#endif
extern int settrackfunc(PyObject *); /* forward */ extern int settrackfunc(PyObject *); /* forward */
extern void clrtrackfunc(void); /* forward */ extern void clrtrackfunc(void); /* forward */
#if !TARGET_API_MAC_CARBON_NOTYET
staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *); staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
#endif
""" """
finalstuff = finalstuff + """ finalstuff = finalstuff + """
@ -196,7 +192,6 @@
PySys_WriteStderr("TrackControl or HandleControlClick: exception in tracker function\\n"); PySys_WriteStderr("TrackControl or HandleControlClick: exception in tracker function\\n");
} }
#if !TARGET_API_MAC_CARBON_NOTYET
static int static int
setcallback(myself, which, callback, uppp) setcallback(myself, which, callback, uppp)
PyObject *myself; PyObject *myself;
@ -313,17 +308,14 @@
Py_XDECREF(rv); Py_XDECREF(rv);
return (ControlPartCode)c_rv; return (ControlPartCode)c_rv;
} }
#endif
""" """
initstuff = initstuff + """ initstuff = initstuff + """
mytracker_upp = NewControlActionProc(mytracker); mytracker_upp = NewControlActionProc(mytracker);
#if !TARGET_API_MAC_CARBON_NOTYET
mydrawproc_upp = NewControlUserPaneDrawProc(mydrawproc); mydrawproc_upp = NewControlUserPaneDrawProc(mydrawproc);
myidleproc_upp = NewControlUserPaneIdleProc(myidleproc); myidleproc_upp = NewControlUserPaneIdleProc(myidleproc);
myhittestproc_upp = NewControlUserPaneHitTestProc(myhittestproc); myhittestproc_upp = NewControlUserPaneHitTestProc(myhittestproc);
mytrackingproc_upp = NewControlUserPaneTrackingProc(mytrackingproc); mytrackingproc_upp = NewControlUserPaneTrackingProc(mytrackingproc);
#endif
""" """
class MyObjectDefinition(ObjectIdentityMixin, GlobalObjectDefinition): class MyObjectDefinition(ObjectIdentityMixin, GlobalObjectDefinition):
@ -600,7 +592,7 @@ def outputCleanupStructMembers(self):
return _res; return _res;
""" """
f = ManualGenerator("SetControlData_Callback", setcontroldata_callback_body, condition="#if !TARGET_API_MAC_CARBON_NOTYET"); f = ManualGenerator("SetControlData_Callback", setcontroldata_callback_body);
f.docstring = lambda: "(callbackfunc) -> None" f.docstring = lambda: "(callbackfunc) -> None"
object.add(f) object.add(f)
@ -618,7 +610,7 @@ def outputCleanupStructMembers(self):
HUnlock((Handle)hdl); HUnlock((Handle)hdl);
return _res; return _res;
""" """
f = ManualGenerator("GetPopupData", getpopupdata_body, condition="#if !TARGET_API_MAC_CARBON_NOTYET") f = ManualGenerator("GetPopupData", getpopupdata_body, condition="#if !TARGET_API_MAC_CARBON")
object.add(f) object.add(f)
setpopupdata_body = """ setpopupdata_body = """
@ -638,7 +630,7 @@ def outputCleanupStructMembers(self):
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
""" """
f = ManualGenerator("SetPopupData", setpopupdata_body, condition="#if !TARGET_API_MAC_CARBON_NOTYET") f = ManualGenerator("SetPopupData", setpopupdata_body, condition="#if !TARGET_API_MAC_CARBON")
object.add(f) object.add(f)