Moved CoreFoundation type support to bgen/macsupport.

Mac/Modules/app/appsupport.py

@@ -69,8 +69,6 @@ ThemeDragSoundKind = OSTypeType("ThemeDragSoundKind")
 ThemeBackgroundKind = Type("ThemeBackgroundKind", "l")
 ThemeMetric = Type("ThemeMetric", "l")
 RGBColor = OpaqueType("RGBColor", "QdRGB")
-CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
-CFMutableStringRef = OpaqueByValueType("CFMutableStringRef", "CFMutableStringRefObj")
 TruncCode = Type("TruncCode", "h")
 
 

Mac/Modules/ibcarbon/IBCarbonsupport.py

@@ -2,7 +2,6 @@
 
 from macsupport import *
 
-CFStringRef = OpaqueByValueType('CFStringRef', 'CFStringRefObj')
 IBNibRef = OpaqueByValueType('IBNibRef', 'IBNibRefObj')
 #CFBundleRef = OpaqueByValueType('CFBundleRef')
 

Mac/Modules/menu/menusupport.py

@@ -36,7 +36,6 @@ MenuItemAttributes = Type("MenuItemAttributes", "l")
 unsigned_char = Type('unsigned char', 'b')
 FMFontFamily = Type("FMFontFamily", "h")
 FMFontStyle = Type("FMFontStyle", "h")
-CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
 UniChar = Type("UniChar", "h")
 
 includestuff = includestuff + """

Mac/Modules/mlte/mltesupport.py

@@ -125,7 +125,6 @@ OptRgnHandle = OpaqueByValueType("RgnHandle", "OptResObj")
 GWorldPtr = OpaqueByValueType("GWorldPtr", "GWorldObj")
 OptGWorldPtr = OpaqueByValueType("GWorldPtr", "OptGWorldObj")
 MlteInBuffer = VarInputBufferType('void *', 'ByteCount', 'l')
-CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
 
 OptFSSpecPtr = OpaqueByValueType("FSSpec *", "OptFSSpecPtr")
 OptRectPtr = OpaqueByValueType("Rect *", "OptRectPtr")

Mac/Modules/win/winsupport.py

@@ -51,7 +51,6 @@ ScrollWindowOptions = Type("ScrollWindowOptions", "l")
 WindowPartCode = Type("WindowPartCode", "h")
 WindowDefPartCode = Type("WindowDefPartCode", "h")
 WindowModality = Type("WindowModality", "l")
-CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
 GDHandle = OpaqueByValueType("GDHandle", "ResObj")
 WindowConstrainOptions = Type("WindowConstrainOptions", "l")
 

Tools/bgen/bgen/macsupport.py

@@ -90,6 +90,17 @@ Point_ptr = OpaqueType("Point", "PyMac_BuildPoint", "PyMac_GetPoint")
 EventRecord = OpaqueType("EventRecord", "PyMac_BuildEventRecord", "PyMac_GetEventRecord")
 EventRecord_ptr = EventRecord
 
+# CoreFoundation datatypes
+CFTypeRef = OpaqueByValueType("CFTypeRef", "CFTypeRefObj")
+CFStringRef = OpaqueByValueType("CFStringRef", "CFStringRefObj")
+CFMutableStringRef = OpaqueByValueType("CFMutableStringRef", "CFMutableStringRefObj")
+CFArrayRef = OpaqueByValueType("CFArrayRef", "CFArrayRefObj")
+CFMutableArrayRef = OpaqueByValueType("CFMutableArrayRef", "CFMutableArrayRefObj")
+CFDictionaryRef = OpaqueByValueType("CFDictionaryRef", "CFDictionaryRefObj")
+CFMutableDictionaryRef = OpaqueByValueType("CFMutableDictionaryRef", "CFMutableDictionaryRefObj")
+CFURLRef = OpaqueByValueType("CFURLRef", "CFURLRefObj")
+OptionalCFURLRef = OpaqueByValueType("CFURLRef", "OptionalCFURLRefObj")
+
 # OSErr is special because it is turned into an exception
 # (Could do this with less code using a variant of mkvalue("O&")?)
 class OSErrType(Type):