Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 736b51d

Browse files
jackjansenjackjansen
committed
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.
1 parent d9d0b5f commit 736b51d

2 files changed

Lines changed: 7 additions & 29 deletions

File tree

‎Mac/Modules/ctl/Ctlmodule.c‎

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,18 +72,14 @@ PyControlID_Convert(v, itself)
7272
/* TrackControl and HandleControlClick callback support */
7373
static PyObject *tracker;
7474
static ControlActionUPP mytracker_upp;
75-
#if !TARGET_API_MAC_CARBON_NOTYET
7675
static ControlUserPaneDrawUPP mydrawproc_upp;
7776
static ControlUserPaneIdleUPP myidleproc_upp;
7877
static ControlUserPaneHitTestUPP myhittestproc_upp;
7978
static ControlUserPaneTrackingUPP mytrackingproc_upp;
80-
#endif
8179

8280
extern int settrackfunc(PyObject *); /* forward */
8381
extern void clrtrackfunc(void); /* forward */
84-
#if !TARGET_API_MAC_CARBON_NOTYET
8582
staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
86-
#endif
8783

8884
static PyObject *Ctl_Error;
8985

@@ -1876,8 +1872,6 @@ static PyObject *CtlObj_GetControlData_Handle(_self, _args)
18761872

18771873
}
18781874

1879-
#if !TARGET_API_MAC_CARBON_NOTYET
1880-
18811875
static PyObject *CtlObj_SetControlData_Callback(_self, _args)
18821876
ControlObject *_self;
18831877
PyObject *_args;
@@ -1910,9 +1904,8 @@ static PyObject *CtlObj_SetControlData_Callback(_self, _args)
19101904
return _res;
19111905

19121906
}
1913-
#endif
19141907

1915-
#if !TARGET_API_MAC_CARBON_NOTYET
1908+
#if !TARGET_API_MAC_CARBON
19161909

19171910
static PyObject *CtlObj_GetPopupData(_self, _args)
19181911
ControlObject *_self;
@@ -1935,7 +1928,7 @@ static PyObject *CtlObj_GetPopupData(_self, _args)
19351928
}
19361929
#endif
19371930

1938-
#if !TARGET_API_MAC_CARBON_NOTYET
1931+
#if !TARGET_API_MAC_CARBON
19391932

19401933
static PyObject *CtlObj_SetPopupData(_self, _args)
19411934
ControlObject *_self;
@@ -2217,18 +2210,15 @@ static PyMethodDef CtlObj_methods[] = {
22172210
"(ResObj) -> None"},
22182211
{"GetControlData_Handle", (PyCFunction)CtlObj_GetControlData_Handle, 1,
22192212
"(part, type) -> ResObj"},
2220-
2221-
#if !TARGET_API_MAC_CARBON_NOTYET
22222213
{"SetControlData_Callback", (PyCFunction)CtlObj_SetControlData_Callback, 1,
22232214
"(callbackfunc) -> None"},
2224-
#endif
22252215

2226-
#if !TARGET_API_MAC_CARBON_NOTYET
2216+
#if !TARGET_API_MAC_CARBON
22272217
{"GetPopupData", (PyCFunction)CtlObj_GetPopupData, 1,
22282218
NULL},
22292219
#endif
22302220

2231-
#if !TARGET_API_MAC_CARBON_NOTYET
2221+
#if !TARGET_API_MAC_CARBON
22322222
{"SetPopupData", (PyCFunction)CtlObj_SetPopupData, 1,
22332223
NULL},
22342224
#endif
@@ -2805,7 +2795,6 @@ mytracker(ControlHandle ctl, short part)
28052795
PySys_WriteStderr("TrackControl or HandleControlClick: exception in tracker function\n");
28062796
}
28072797

2808-
#if !TARGET_API_MAC_CARBON_NOTYET
28092798
static int
28102799
setcallback(myself, which, callback, uppp)
28112800
PyObject *myself;
@@ -2922,7 +2911,6 @@ mytrackingproc(ControlHandle control, Point startPt, ControlActionUPP actionProc
29222911
Py_XDECREF(rv);
29232912
return (ControlPartCode)c_rv;
29242913
}
2925-
#endif
29262914

29272915

29282916
void initCtl()
@@ -2933,12 +2921,10 @@ void initCtl()
29332921

29342922

29352923
mytracker_upp = NewControlActionProc(mytracker);
2936-
#if !TARGET_API_MAC_CARBON_NOTYET
29372924
mydrawproc_upp = NewControlUserPaneDrawProc(mydrawproc);
29382925
myidleproc_upp = NewControlUserPaneIdleProc(myidleproc);
29392926
myhittestproc_upp = NewControlUserPaneHitTestProc(myhittestproc);
29402927
mytrackingproc_upp = NewControlUserPaneTrackingProc(mytrackingproc);
2941-
#endif
29422928

29432929

29442930
m = Py_InitModule("Ctl", Ctl_methods);

‎Mac/Modules/ctl/ctlsupport.py‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -113,18 +113,14 @@
113113
/* TrackControl and HandleControlClick callback support */
114114
static PyObject *tracker;
115115
static ControlActionUPP mytracker_upp;
116-
#if !TARGET_API_MAC_CARBON_NOTYET
117116
static ControlUserPaneDrawUPP mydrawproc_upp;
118117
static ControlUserPaneIdleUPP myidleproc_upp;
119118
static ControlUserPaneHitTestUPP myhittestproc_upp;
120119
static ControlUserPaneTrackingUPP mytrackingproc_upp;
121-
#endif
122120
123121
extern int settrackfunc(PyObject *); /* forward */
124122
extern void clrtrackfunc(void); /* forward */
125-
#if !TARGET_API_MAC_CARBON_NOTYET
126123
staticforward int setcallback(PyObject *, OSType, PyObject *, UniversalProcPtr *);
127-
#endif
128124
"""
129125

130126
finalstuff = finalstuff + """
@@ -196,7 +192,6 @@
196192
PySys_WriteStderr("TrackControl or HandleControlClick: exception in tracker function\\n");
197193
}
198194
199-
#if !TARGET_API_MAC_CARBON_NOTYET
200195
static int
201196
setcallback(myself, which, callback, uppp)
202197
PyObject *myself;
@@ -313,17 +308,14 @@
313308
Py_XDECREF(rv);
314309
return (ControlPartCode)c_rv;
315310
}
316-
#endif
317311
"""
318312

319313
initstuff = initstuff + """
320314
mytracker_upp = NewControlActionProc(mytracker);
321-
#if !TARGET_API_MAC_CARBON_NOTYET
322315
mydrawproc_upp = NewControlUserPaneDrawProc(mydrawproc);
323316
myidleproc_upp = NewControlUserPaneIdleProc(myidleproc);
324317
myhittestproc_upp = NewControlUserPaneHitTestProc(myhittestproc);
325318
mytrackingproc_upp = NewControlUserPaneTrackingProc(mytrackingproc);
326-
#endif
327319
"""
328320

329321
class MyObjectDefinition(ObjectIdentityMixin, GlobalObjectDefinition):
@@ -600,7 +592,7 @@ def outputCleanupStructMembers(self):
600592
return _res;
601593
"""
602594

603-
f = ManualGenerator("SetControlData_Callback", setcontroldata_callback_body, condition="#if !TARGET_API_MAC_CARBON_NOTYET");
595+
f = ManualGenerator("SetControlData_Callback", setcontroldata_callback_body);
604596
f.docstring = lambda: "(callbackfunc) -> None"
605597
object.add(f)
606598

@@ -618,7 +610,7 @@ def outputCleanupStructMembers(self):
618610
HUnlock((Handle)hdl);
619611
return _res;
620612
"""
621-
f = ManualGenerator("GetPopupData", getpopupdata_body, condition="#if !TARGET_API_MAC_CARBON_NOTYET")
613+
f = ManualGenerator("GetPopupData", getpopupdata_body, condition="#if !TARGET_API_MAC_CARBON")
622614
object.add(f)
623615

624616
setpopupdata_body = """
@@ -638,7 +630,7 @@ def outputCleanupStructMembers(self):
638630
Py_INCREF(Py_None);
639631
return Py_None;
640632
"""
641-
f = ManualGenerator("SetPopupData", setpopupdata_body, condition="#if !TARGET_API_MAC_CARBON_NOTYET")
633+
f = ManualGenerator("SetPopupData", setpopupdata_body, condition="#if !TARGET_API_MAC_CARBON")
642634
object.add(f)
643635

644636

0 commit comments

Comments
 (0)