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

Skip to content

Commit f34a8bc

Browse files
jackjansenjackjansen
committed
Moved CoreFoundation type support to bgen/macsupport.
1 parent 286e838 commit f34a8bc

7 files changed

Lines changed: 75 additions & 70 deletions

File tree

‎Mac/Modules/app/appsupport.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@
6969
ThemeBackgroundKind = Type("ThemeBackgroundKind", "l")
7070
ThemeMetric = Type("ThemeMetric", "l")
7171
RGBColor = OpaqueType("RGBColor", "QdRGB")
72-
CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
73-
CFMutableStringRef = OpaqueByValueType("CFMutableStringRef", "CFMutableStringRefObj")
7472
TruncCode = Type("TruncCode", "h")
7573

7674

‎Mac/Modules/ibcarbon/IBCarbonsupport.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
from macsupport import *
44

5-
CFStringRef = OpaqueByValueType('CFStringRef', 'CFStringRefObj')
65
IBNibRef = OpaqueByValueType('IBNibRef', 'IBNibRefObj')
76
#CFBundleRef = OpaqueByValueType('CFBundleRef')
87

‎Mac/Modules/menu/menusupport.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
unsigned_char = Type('unsigned char', 'b')
3737
FMFontFamily = Type("FMFontFamily", "h")
3838
FMFontStyle = Type("FMFontStyle", "h")
39-
CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
4039
UniChar = Type("UniChar", "h")
4140

4241
includestuff = includestuff + """

‎Mac/Modules/mlte/_Mltemodule.c‎

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,116 +1182,116 @@ static PyObject *TXNObj_TXNIsObjectAttachedToSpecificWindow(TXNObjectObject *_se
11821182

11831183
static PyMethodDef TXNObj_methods[] = {
11841184
{"TXNDeleteObject", (PyCFunction)TXNObj_TXNDeleteObject, 1,
1185-
"() -> None"},
1185+
PyDoc_STR("() -> None")},
11861186
{"TXNResizeFrame", (PyCFunction)TXNObj_TXNResizeFrame, 1,
1187-
"(UInt32 iWidth, UInt32 iHeight, TXNFrameID iTXNFrameID) -> None"},
1187+
PyDoc_STR("(UInt32 iWidth, UInt32 iHeight, TXNFrameID iTXNFrameID) -> None")},
11881188
{"TXNSetFrameBounds", (PyCFunction)TXNObj_TXNSetFrameBounds, 1,
1189-
"(SInt32 iTop, SInt32 iLeft, SInt32 iBottom, SInt32 iRight, TXNFrameID iTXNFrameID) -> None"},
1189+
PyDoc_STR("(SInt32 iTop, SInt32 iLeft, SInt32 iBottom, SInt32 iRight, TXNFrameID iTXNFrameID) -> None")},
11901190
{"TXNKeyDown", (PyCFunction)TXNObj_TXNKeyDown, 1,
1191-
"(EventRecord iEvent) -> None"},
1191+
PyDoc_STR("(EventRecord iEvent) -> None")},
11921192
{"TXNAdjustCursor", (PyCFunction)TXNObj_TXNAdjustCursor, 1,
1193-
"(RgnHandle ioCursorRgn) -> None"},
1193+
PyDoc_STR("(RgnHandle ioCursorRgn) -> None")},
11941194
{"TXNClick", (PyCFunction)TXNObj_TXNClick, 1,
1195-
"(EventRecord iEvent) -> None"},
1195+
PyDoc_STR("(EventRecord iEvent) -> None")},
11961196

11971197
#if TARGET_API_MAC_OS8
11981198
{"TXNTSMCheck", (PyCFunction)TXNObj_TXNTSMCheck, 1,
1199-
"() -> (Boolean _rv, EventRecord ioEvent)"},
1199+
PyDoc_STR("() -> (Boolean _rv, EventRecord ioEvent)")},
12001200
#endif
12011201
{"TXNSelectAll", (PyCFunction)TXNObj_TXNSelectAll, 1,
1202-
"() -> None"},
1202+
PyDoc_STR("() -> None")},
12031203
{"TXNFocus", (PyCFunction)TXNObj_TXNFocus, 1,
1204-
"(Boolean iBecomingFocused) -> None"},
1204+
PyDoc_STR("(Boolean iBecomingFocused) -> None")},
12051205
{"TXNUpdate", (PyCFunction)TXNObj_TXNUpdate, 1,
1206-
"() -> None"},
1206+
PyDoc_STR("() -> None")},
12071207
{"TXNDraw", (PyCFunction)TXNObj_TXNDraw, 1,
1208-
"(GWorldPtr iDrawPort) -> None"},
1208+
PyDoc_STR("(GWorldPtr iDrawPort) -> None")},
12091209
{"TXNForceUpdate", (PyCFunction)TXNObj_TXNForceUpdate, 1,
1210-
"() -> None"},
1210+
PyDoc_STR("() -> None")},
12111211
{"TXNGetSleepTicks", (PyCFunction)TXNObj_TXNGetSleepTicks, 1,
1212-
"() -> (UInt32 _rv)"},
1212+
PyDoc_STR("() -> (UInt32 _rv)")},
12131213
{"TXNIdle", (PyCFunction)TXNObj_TXNIdle, 1,
1214-
"() -> None"},
1214+
PyDoc_STR("() -> None")},
12151215
{"TXNGrowWindow", (PyCFunction)TXNObj_TXNGrowWindow, 1,
1216-
"(EventRecord iEvent) -> None"},
1216+
PyDoc_STR("(EventRecord iEvent) -> None")},
12171217
{"TXNZoomWindow", (PyCFunction)TXNObj_TXNZoomWindow, 1,
1218-
"(short iPart) -> None"},
1218+
PyDoc_STR("(short iPart) -> None")},
12191219
{"TXNCanUndo", (PyCFunction)TXNObj_TXNCanUndo, 1,
1220-
"() -> (Boolean _rv, TXNActionKey oTXNActionKey)"},
1220+
PyDoc_STR("() -> (Boolean _rv, TXNActionKey oTXNActionKey)")},
12211221
{"TXNUndo", (PyCFunction)TXNObj_TXNUndo, 1,
1222-
"() -> None"},
1222+
PyDoc_STR("() -> None")},
12231223
{"TXNCanRedo", (PyCFunction)TXNObj_TXNCanRedo, 1,
1224-
"() -> (Boolean _rv, TXNActionKey oTXNActionKey)"},
1224+
PyDoc_STR("() -> (Boolean _rv, TXNActionKey oTXNActionKey)")},
12251225
{"TXNRedo", (PyCFunction)TXNObj_TXNRedo, 1,
1226-
"() -> None"},
1226+
PyDoc_STR("() -> None")},
12271227
{"TXNCut", (PyCFunction)TXNObj_TXNCut, 1,
1228-
"() -> None"},
1228+
PyDoc_STR("() -> None")},
12291229
{"TXNCopy", (PyCFunction)TXNObj_TXNCopy, 1,
1230-
"() -> None"},
1230+
PyDoc_STR("() -> None")},
12311231
{"TXNPaste", (PyCFunction)TXNObj_TXNPaste, 1,
1232-
"() -> None"},
1232+
PyDoc_STR("() -> None")},
12331233
{"TXNClear", (PyCFunction)TXNObj_TXNClear, 1,
1234-
"() -> None"},
1234+
PyDoc_STR("() -> None")},
12351235
{"TXNGetSelection", (PyCFunction)TXNObj_TXNGetSelection, 1,
1236-
"() -> (TXNOffset oStartOffset, TXNOffset oEndOffset)"},
1236+
PyDoc_STR("() -> (TXNOffset oStartOffset, TXNOffset oEndOffset)")},
12371237
{"TXNShowSelection", (PyCFunction)TXNObj_TXNShowSelection, 1,
1238-
"(Boolean iShowEnd) -> None"},
1238+
PyDoc_STR("(Boolean iShowEnd) -> None")},
12391239
{"TXNIsSelectionEmpty", (PyCFunction)TXNObj_TXNIsSelectionEmpty, 1,
1240-
"() -> (Boolean _rv)"},
1240+
PyDoc_STR("() -> (Boolean _rv)")},
12411241
{"TXNSetSelection", (PyCFunction)TXNObj_TXNSetSelection, 1,
1242-
"(TXNOffset iStartOffset, TXNOffset iEndOffset) -> None"},
1242+
PyDoc_STR("(TXNOffset iStartOffset, TXNOffset iEndOffset) -> None")},
12431243
{"TXNCountRunsInRange", (PyCFunction)TXNObj_TXNCountRunsInRange, 1,
1244-
"(TXNOffset iStartOffset, TXNOffset iEndOffset) -> (ItemCount oRunCount)"},
1244+
PyDoc_STR("(TXNOffset iStartOffset, TXNOffset iEndOffset) -> (ItemCount oRunCount)")},
12451245
{"TXNDataSize", (PyCFunction)TXNObj_TXNDataSize, 1,
1246-
"() -> (ByteCount _rv)"},
1246+
PyDoc_STR("() -> (ByteCount _rv)")},
12471247
{"TXNGetData", (PyCFunction)TXNObj_TXNGetData, 1,
1248-
"(TXNOffset iStartOffset, TXNOffset iEndOffset) -> (Handle oDataHandle)"},
1248+
PyDoc_STR("(TXNOffset iStartOffset, TXNOffset iEndOffset) -> (Handle oDataHandle)")},
12491249
{"TXNGetDataEncoded", (PyCFunction)TXNObj_TXNGetDataEncoded, 1,
1250-
"(TXNOffset iStartOffset, TXNOffset iEndOffset, TXNDataType iEncoding) -> (Handle oDataHandle)"},
1250+
PyDoc_STR("(TXNOffset iStartOffset, TXNOffset iEndOffset, TXNDataType iEncoding) -> (Handle oDataHandle)")},
12511251
{"TXNSetDataFromFile", (PyCFunction)TXNObj_TXNSetDataFromFile, 1,
1252-
"(SInt16 iFileRefNum, OSType iFileType, ByteCount iFileLength, TXNOffset iStartOffset, TXNOffset iEndOffset) -> None"},
1252+
PyDoc_STR("(SInt16 iFileRefNum, OSType iFileType, ByteCount iFileLength, TXNOffset iStartOffset, TXNOffset iEndOffset) -> None")},
12531253
{"TXNSetData", (PyCFunction)TXNObj_TXNSetData, 1,
1254-
"(TXNDataType iDataType, Buffer iDataPtr, TXNOffset iStartOffset, TXNOffset iEndOffset) -> None"},
1254+
PyDoc_STR("(TXNDataType iDataType, Buffer iDataPtr, TXNOffset iStartOffset, TXNOffset iEndOffset) -> None")},
12551255
{"TXNGetChangeCount", (PyCFunction)TXNObj_TXNGetChangeCount, 1,
1256-
"() -> (ItemCount _rv)"},
1256+
PyDoc_STR("() -> (ItemCount _rv)")},
12571257
{"TXNSave", (PyCFunction)TXNObj_TXNSave, 1,
1258-
"(TXNFileType iType, OSType iResType, TXNPermanentTextEncodingType iPermanentEncoding, FSSpec iFileSpecification, SInt16 iDataReference, SInt16 iResourceReference) -> None"},
1258+
PyDoc_STR("(TXNFileType iType, OSType iResType, TXNPermanentTextEncodingType iPermanentEncoding, FSSpec iFileSpecification, SInt16 iDataReference, SInt16 iResourceReference) -> None")},
12591259
{"TXNRevert", (PyCFunction)TXNObj_TXNRevert, 1,
1260-
"() -> None"},
1260+
PyDoc_STR("() -> None")},
12611261
{"TXNPageSetup", (PyCFunction)TXNObj_TXNPageSetup, 1,
1262-
"() -> None"},
1262+
PyDoc_STR("() -> None")},
12631263
{"TXNPrint", (PyCFunction)TXNObj_TXNPrint, 1,
1264-
"() -> None"},
1264+
PyDoc_STR("() -> None")},
12651265
{"TXNGetViewRect", (PyCFunction)TXNObj_TXNGetViewRect, 1,
1266-
"() -> (Rect oViewRect)"},
1266+
PyDoc_STR("() -> (Rect oViewRect)")},
12671267
{"TXNSetViewRect", (PyCFunction)TXNObj_TXNSetViewRect, 1,
1268-
"(Rect iViewRect) -> None"},
1268+
PyDoc_STR("(Rect iViewRect) -> None")},
12691269
{"TXNAttachObjectToWindow", (PyCFunction)TXNObj_TXNAttachObjectToWindow, 1,
1270-
"(GWorldPtr iWindow, Boolean iIsActualWindow) -> None"},
1270+
PyDoc_STR("(GWorldPtr iWindow, Boolean iIsActualWindow) -> None")},
12711271
{"TXNIsObjectAttachedToWindow", (PyCFunction)TXNObj_TXNIsObjectAttachedToWindow, 1,
1272-
"() -> (Boolean _rv)"},
1272+
PyDoc_STR("() -> (Boolean _rv)")},
12731273
{"TXNDragTracker", (PyCFunction)TXNObj_TXNDragTracker, 1,
1274-
"(TXNFrameID iTXNFrameID, DragTrackingMessage iMessage, WindowPtr iWindow, DragReference iDragReference, Boolean iDifferentObjectSameWindow) -> None"},
1274+
PyDoc_STR("(TXNFrameID iTXNFrameID, DragTrackingMessage iMessage, WindowPtr iWindow, DragReference iDragReference, Boolean iDifferentObjectSameWindow) -> None")},
12751275
{"TXNDragReceiver", (PyCFunction)TXNObj_TXNDragReceiver, 1,
1276-
"(TXNFrameID iTXNFrameID, WindowPtr iWindow, DragReference iDragReference, Boolean iDifferentObjectSameWindow) -> None"},
1276+
PyDoc_STR("(TXNFrameID iTXNFrameID, WindowPtr iWindow, DragReference iDragReference, Boolean iDifferentObjectSameWindow) -> None")},
12771277
{"TXNActivate", (PyCFunction)TXNObj_TXNActivate, 1,
1278-
"(TXNFrameID iTXNFrameID, TXNScrollBarState iActiveState) -> None"},
1278+
PyDoc_STR("(TXNFrameID iTXNFrameID, TXNScrollBarState iActiveState) -> None")},
12791279
{"TXNEchoMode", (PyCFunction)TXNObj_TXNEchoMode, 1,
1280-
"(UniChar iEchoCharacter, TextEncoding iEncoding, Boolean iOn) -> None"},
1280+
PyDoc_STR("(UniChar iEchoCharacter, TextEncoding iEncoding, Boolean iOn) -> None")},
12811281
{"TXNDoFontMenuSelection", (PyCFunction)TXNObj_TXNDoFontMenuSelection, 1,
1282-
"(TXNFontMenuObject iTXNFontMenuObject, SInt16 iMenuID, SInt16 iMenuItem) -> None"},
1282+
PyDoc_STR("(TXNFontMenuObject iTXNFontMenuObject, SInt16 iMenuID, SInt16 iMenuItem) -> None")},
12831283
{"TXNPrepareFontMenu", (PyCFunction)TXNObj_TXNPrepareFontMenu, 1,
1284-
"(TXNFontMenuObject iTXNFontMenuObject) -> None"},
1284+
PyDoc_STR("(TXNFontMenuObject iTXNFontMenuObject) -> None")},
12851285
{"TXNPointToOffset", (PyCFunction)TXNObj_TXNPointToOffset, 1,
1286-
"(Point iPoint) -> (TXNOffset oOffset)"},
1286+
PyDoc_STR("(Point iPoint) -> (TXNOffset oOffset)")},
12871287
{"TXNOffsetToPoint", (PyCFunction)TXNObj_TXNOffsetToPoint, 1,
1288-
"(TXNOffset iOffset) -> (Point oPoint)"},
1288+
PyDoc_STR("(TXNOffset iOffset) -> (Point oPoint)")},
12891289
{"TXNGetLineCount", (PyCFunction)TXNObj_TXNGetLineCount, 1,
1290-
"() -> (ItemCount oLineTotal)"},
1290+
PyDoc_STR("() -> (ItemCount oLineTotal)")},
12911291
{"TXNGetLineMetrics", (PyCFunction)TXNObj_TXNGetLineMetrics, 1,
1292-
"(UInt32 iLineNumber) -> (Fixed oLineWidth, Fixed oLineHeight)"},
1292+
PyDoc_STR("(UInt32 iLineNumber) -> (Fixed oLineWidth, Fixed oLineHeight)")},
12931293
{"TXNIsObjectAttachedToSpecificWindow", (PyCFunction)TXNObj_TXNIsObjectAttachedToSpecificWindow, 1,
1294-
"(WindowPtr iWindow) -> (Boolean oAttached)"},
1294+
PyDoc_STR("(WindowPtr iWindow) -> (Boolean oAttached)")},
12951295
{NULL, NULL, 0}
12961296
};
12971297

@@ -1405,9 +1405,9 @@ static PyObject *TXNFontMenuObj_TXNDisposeFontMenuObject(TXNFontMenuObjectObject
14051405

14061406
static PyMethodDef TXNFontMenuObj_methods[] = {
14071407
{"TXNGetFontMenuHandle", (PyCFunction)TXNFontMenuObj_TXNGetFontMenuHandle, 1,
1408-
"() -> (MenuHandle oFontMenuHandle)"},
1408+
PyDoc_STR("() -> (MenuHandle oFontMenuHandle)")},
14091409
{"TXNDisposeFontMenuObject", (PyCFunction)TXNFontMenuObj_TXNDisposeFontMenuObject, 1,
1410-
"() -> None"},
1410+
PyDoc_STR("() -> None")},
14111411
{NULL, NULL, 0}
14121412
};
14131413

@@ -1617,21 +1617,21 @@ static PyObject *Mlte_TXNInitTextension(PyObject *_self, PyObject *_args)
16171617

16181618
static PyMethodDef Mlte_methods[] = {
16191619
{"TXNNewObject", (PyCFunction)Mlte_TXNNewObject, 1,
1620-
"(FSSpec * iFileSpec, WindowPtr iWindow, Rect * iFrame, TXNFrameOptions iFrameOptions, TXNFrameType iFrameType, TXNFileType iFileType, TXNPermanentTextEncodingType iPermanentEncoding) -> (TXNObject oTXNObject, TXNFrameID oTXNFrameID)"},
1620+
PyDoc_STR("(FSSpec * iFileSpec, WindowPtr iWindow, Rect * iFrame, TXNFrameOptions iFrameOptions, TXNFrameType iFrameType, TXNFileType iFileType, TXNPermanentTextEncodingType iPermanentEncoding) -> (TXNObject oTXNObject, TXNFrameID oTXNFrameID)")},
16211621
{"TXNTerminateTextension", (PyCFunction)Mlte_TXNTerminateTextension, 1,
1622-
"() -> None"},
1622+
PyDoc_STR("() -> None")},
16231623
{"TXNIsScrapPastable", (PyCFunction)Mlte_TXNIsScrapPastable, 1,
1624-
"() -> (Boolean _rv)"},
1624+
PyDoc_STR("() -> (Boolean _rv)")},
16251625
{"TXNConvertToPublicScrap", (PyCFunction)Mlte_TXNConvertToPublicScrap, 1,
1626-
"() -> None"},
1626+
PyDoc_STR("() -> None")},
16271627
{"TXNConvertFromPublicScrap", (PyCFunction)Mlte_TXNConvertFromPublicScrap, 1,
1628-
"() -> None"},
1628+
PyDoc_STR("() -> None")},
16291629
{"TXNNewFontMenuObject", (PyCFunction)Mlte_TXNNewFontMenuObject, 1,
1630-
"(MenuHandle iFontMenuHandle, SInt16 iMenuID, SInt16 iStartHierMenuID) -> (TXNFontMenuObject oTXNFontMenuObject)"},
1630+
PyDoc_STR("(MenuHandle iFontMenuHandle, SInt16 iMenuID, SInt16 iStartHierMenuID) -> (TXNFontMenuObject oTXNFontMenuObject)")},
16311631
{"TXNVersionInformation", (PyCFunction)Mlte_TXNVersionInformation, 1,
1632-
"() -> (TXNVersionValue _rv, TXNFeatureBits oFeatureFlags)"},
1632+
PyDoc_STR("() -> (TXNVersionValue _rv, TXNFeatureBits oFeatureFlags)")},
16331633
{"TXNInitTextension", (PyCFunction)Mlte_TXNInitTextension, 1,
1634-
"(TXNInitOptions) -> None"},
1634+
PyDoc_STR("(TXNInitOptions) -> None")},
16351635
{NULL, NULL, 0}
16361636
};
16371637

‎Mac/Modules/mlte/mltesupport.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
GWorldPtr = OpaqueByValueType("GWorldPtr", "GWorldObj")
126126
OptGWorldPtr = OpaqueByValueType("GWorldPtr", "OptGWorldObj")
127127
MlteInBuffer = VarInputBufferType('void *', 'ByteCount', 'l')
128-
CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
129128

130129
OptFSSpecPtr = OpaqueByValueType("FSSpec *", "OptFSSpecPtr")
131130
OptRectPtr = OpaqueByValueType("Rect *", "OptRectPtr")

‎Mac/Modules/win/winsupport.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
WindowPartCode = Type("WindowPartCode", "h")
5252
WindowDefPartCode = Type("WindowDefPartCode", "h")
5353
WindowModality = Type("WindowModality", "l")
54-
CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
5554
GDHandle = OpaqueByValueType("GDHandle", "ResObj")
5655
WindowConstrainOptions = Type("WindowConstrainOptions", "l")
5756

‎Tools/bgen/bgen/macsupport.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,17 @@ def OSTypeType(typename):
9090
EventRecord = OpaqueType("EventRecord", "PyMac_BuildEventRecord", "PyMac_GetEventRecord")
9191
EventRecord_ptr = EventRecord
9292

93+
# CoreFoundation datatypes
94+
CFTypeRef = OpaqueByValueType("CFTypeRef", "CFTypeRefObj")
95+
CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
96+
CFMutableStringRef = OpaqueByValueType("CFMutableStringRef", "CFMutableStringRefObj")
97+
CFArrayRef = OpaqueByValueType("CFArrayRef", "CFArrayRefObj")
98+
CFMutableArrayRef = OpaqueByValueType("CFMutableArrayRef", "CFMutableArrayRefObj")
99+
CFDictionaryRef = OpaqueByValueType("CFDictionaryRef", "CFDictionaryRefObj")
100+
CFMutableDictionaryRef = OpaqueByValueType("CFMutableDictionaryRef", "CFMutableDictionaryRefObj")
101+
CFURLRef = OpaqueByValueType("CFURLRef", "CFURLRefObj")
102+
OptionalCFURLRef = OpaqueByValueType("CFURLRef", "OptionalCFURLRefObj")
103+
93104
# OSErr is special because it is turned into an exception
94105
# (Could do this with less code using a variant of mkvalue("O&")?)
95106
class OSErrType(Type):

0 commit comments

Comments
 (0)