Commits

Ronald Oussoren committed 556addb

Switch to central setup.py and fix a number of test issues

Comments (0)

Files changed (10)

pyobjc-framework-Quartz/Lib/Quartz/CoreGraphics/PyObjC.bridgesupport

   <struct name='CGEventTapInformation' type='{CGEventTapInformation="eventTapID"I"tapPoint"I"options"I"eventsOfInterest"Q"tappingProcess"i"processBeingTapped"i"enabled"B"minUsecLatency"f"avgUsecLatency"f"maxUsecLatency"f}' type64='{CGEventTapInformation="eventTapID"I"tapPoint"I"options"I"eventsOfInterest"Q"tappingProcess"i"processBeingTapped"i"enabled"B"minUsecLatency"f"avgUsecLatency"f"maxUsecLatency"f}' />
   <struct name='CGFunctionCallbacks' type='{CGFunctionCallbacks="version"I"evaluate"^?"releaseInfo"^?}' type64='{CGFunctionCallbacks="version"I"evaluate"^?"releaseInfo"^?}' />
   <struct name='CGPSConverterCallbacks' type='{CGPSConverterCallbacks="version"I"beginDocument"^?"endDocument"^?"beginPage"^?"endPage"^?"noteProgress"^?"noteMessage"^?"releaseInfo"^?}' type64='{CGPSConverterCallbacks="version"I"beginDocument"^?"endDocument"^?"beginPage"^?"endPage"^?"noteProgress"^?"noteMessage"^?"releaseInfo"^?}' />
-  <struct name='CGPathElement' type='{CGPathElement="type"i"points"^{_NSPoint}}' type64='{CGPathElement="type"i"points"^{_NSPoint}}' />
+  <struct name='CGPathElement' type='{CGPathElement="type"i"points"^{CGPoint}}' type64='{CGPathElement="type"i"points"^{CGPoint}}' />
   <struct name='CGPatternCallbacks' type='{CGPatternCallbacks="version"I"drawPattern"^?"releaseInfo"^?}' type64='{CGPatternCallbacks="version"I"drawPattern"^?"releaseInfo"^?}' />
+  <struct name='CGPoint' type='{CGPoint="x"f"y"f}' type64='{CGPoint="x"d"y"d}' alias='Foundation.NSPoint' />
+  <struct name='CGRect' type='{CGRect="origin"{CGPoint="x"f"y"f}"size"{CGSize="width"f"height"f}}' type64='{CGRect="origin"{CGPoint="x"d"y"d}"size"{CGSize="width"d"height"d}}' alias='Foundation.NSRect'/>
   <struct name='CGScreenUpdateMoveDelta' type='{_CGScreenUpdateMoveDelta="dX"i"dY"i}' type64='{_CGScreenUpdateMoveDelta="dX"i"dY"i}' />
+  <struct name='CGSize' type='{CGSize="width"f"height"f}' type64='{CGSize="width"d"height"d}' alias='Foundation.NSSize' />
   <opaque name='CGDirectPaletteRef' type='^{_CGDirectPaletteRef=}' type64='^{_CGDirectPaletteRef=}' />
   <opaque name='CGDisplayConfigRef' type='^{_CGDisplayConfigRef=}' type64='^{_CGDisplayConfigRef=}' />
   <opaque name='CGEventTapProxy' type='^{__CGEventTapProxy=}' type64='^{__CGEventTapProxy=}' />
   <cftype gettypeid_func='CGPatternGetTypeID' name='CGPatternRef' type='^{CGPattern=}' type64='^{CGPattern=}' />
   <cftype gettypeid_func='CGShadingGetTypeID' name='CGShadingRef' type='^{CGShading=}' type64='^{CGShading=}' />
   <constant name='CGAffineTransformIdentity' type='{CGAffineTransform=ffffff}' type64='{CGAffineTransform=dddddd}' />
-  <constant name='CGPointZero' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-  <constant name='CGRectInfinite' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-  <constant name='CGRectNull' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-  <constant name='CGRectZero' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-  <constant name='CGSizeZero' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+  <constant name='CGPointZero' type='{CGPoint=ff}' type64='{CGPoint=dd}' />
+  <constant name='CGRectInfinite' type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+  <constant name='CGRectNull' type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+  <constant name='CGRectZero' type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+  <constant name='CGSizeZero' type='{CGSize=ff}' type64='{CGSize=dd}' />
   <constant name='kCGColorBlack' type='^{__CFString=}' />
   <constant name='kCGColorClear' type='^{__CFString=}' />
   <constant name='kCGColorSpaceGenericGrayGamma2_2' type='^{__CFString=}' />
   <function name='CGDisplayCreateImageForRect'>
     <retval already_cfretained='true' type='^{CGImage=}' />
     <arg type='I' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGDisplayModeRelease'>
 	  <retval type='v' />
   <function name='CGColorCreate'>
     <retval already_cfretained='true' type='^{CGColor=}' />
     <arg type='^{CGColorSpace=}' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
   </function>
   <function name='CGColorCreateCopy'>
     <retval already_cfretained='true' type='^{CGColor=}' />
     <retval already_cfretained='true' type='^{CGColor=}' />
     <arg type='^{CGColorSpace=}' />
     <arg type='^{CGPattern=}' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
   </function>
   <function name='CGColorEqualToColor'>
     <retval type='Z' />
   </function>
   <function name='CGColorSpaceCreateCalibratedRGB'>
     <retval already_cfretained='true' type='^{CGColorSpace=}' />
-    <arg type='[3f]' type64='[3d]' />
-    <arg type='[3f]' type64='[3d]' />
-    <arg type='[3f]' type64='[3d]' />
-    <arg type='[9f]' type64='[9d]' />
+    <arg type='[3f]' type64='[3f]' />
+    <arg type='[3f]' type64='[3f]' />
+    <arg type='[3f]' type64='[3f]' />
+    <arg type='[9f]' type64='[9f]' />
   </function>
   <function name='CGColorSpaceCreateDeviceCMYK'>
     <retval already_cfretained='true' type='^{CGColorSpace=}' />
   <function name='CGColorSpaceCreateICCBased'>
     <retval already_cfretained='true' type='^{CGColorSpace=}' />
     <arg type='L' type64='L' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
     <arg type='^{CGDataProvider=}' />
     <arg type='^{CGColorSpace=}' />
   </function>
   </function>
   <function name='CGColorSpaceCreateLab'>
     <retval already_cfretained='true' type='^{CGColorSpace=}' />
-    <arg type='[3f]' type64='[3d]' />
-    <arg type='[3f]' type64='[3d]' />
-    <arg type='[4f]' type64='[4d]' />
+    <arg type='[3f]' type64='[3f]' />
+    <arg type='[3f]' type64='[3f]' />
+    <arg type='[4f]' type64='[4f]' />
   </function>
   <function name='CGColorSpaceCreatePattern'>
     <retval already_cfretained='true' type='^{CGColorSpace=}' />
   </function>
   <function name='CGContextAddEllipseInRect'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGContextAddLineToPoint'>
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextAddLines'>
     <arg type='^{CGContext=}' />
-    <arg c_array_length_in_arg='2' type='^{_NSPoint=ff}' type64='^{_NSPoint=dd}' type_modifier='n' />
+    <arg c_array_length_in_arg='2' type='^{CGPoint=ff}' type64='^{CGPoint=dd}' type_modifier='n' />
     <arg type='L' type64='L' />
   </function>
   <function name='CGContextAddPath'>
   </function>
   <function name='CGContextAddRect'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGContextAddRects'>
     <arg type='^{CGContext=}' />
-    <arg c_array_length_in_arg='2' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='n' />
+    <arg c_array_length_in_arg='2' type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg type='L' type64='L' />
   </function>
   <function name='CGContextBeginPage'>
     <arg type='^{CGContext=}' />
-    <arg type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='n' />
+    <arg type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
   </function>
   <function name='CGContextBeginPath'>
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextBeginTransparencyLayerWithRect'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{__CFDictionary=}' />
   </function>
   <function name='CGContextClearRect'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGContextClip'>
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextClipToMask'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGImage=}' />
   </function>
   <function name='CGContextClipToRect'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGContextClipToRects'>
     <arg type='^{CGContext=}' />
-    <arg c_array_length_in_arg='2' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='n' />
+    <arg c_array_length_in_arg='2' type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg type='L' type64='L' />
   </function>
   <function name='CGContextClosePath'>
     <arg type='{CGAffineTransform=ffffff}' type64='{CGAffineTransform=dddddd}' />
   </function>
   <function name='CGContextConvertPointToDeviceSpace'>
-    <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <retval type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='^{CGContext=}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='CGContextConvertPointToUserSpace'>
-    <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <retval type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='^{CGContext=}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='CGContextConvertRectToDeviceSpace'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGContextConvertRectToUserSpace'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGContextConvertSizeToDeviceSpace'>
-    <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <retval type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='^{CGContext=}' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
   </function>
   <function name='CGContextConvertSizeToUserSpace'>
-    <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <retval type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='^{CGContext=}' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
   </function>
   <function name='CGContextDrawImage'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGImage=}' />
   </function>
   <function name='CGContextDrawLayerAtPoint'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='^{CGLayer=}' />
   </function>
   <function name='CGContextDrawLayerInRect'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGLayer=}' />
   </function>
   <function name='CGContextDrawLinearGradient'>
     <arg type='^{CGContext=}' />
     <arg type='^{CGGradient=}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='I' />
   </function>
   <function name='CGContextDrawPDFDocument'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGPDFDocument=}' />
     <arg type='i' />
   </function>
   <function name='CGContextDrawRadialGradient'>
     <arg type='^{CGContext=}' />
     <arg type='^{CGGradient=}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='f' type64='d' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='f' type64='d' />
     <arg type='I' />
   </function>
   </function>
   <function name='CGContextDrawTiledImage'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGImage=}' />
   </function>
   <function name='CGContextEOClip'>
   </function>
   <function name='CGContextFillEllipseInRect'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGContextFillPath'>
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextFillRect'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGContextFillRects'>
     <arg type='^{CGContext=}' />
-    <arg c_array_length_in_arg='2' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='n' />
+    <arg c_array_length_in_arg='2' type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg type='L' type64='L' />
   </function>
   <function name='CGContextFlush'>
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextGetClipBoundingBox'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextGetInterpolationQuality'>
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextGetPathBoundingBox'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextGetPathCurrentPoint'>
-    <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <retval type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextGetTextMatrix'>
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextGetTextPosition'>
-    <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <retval type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextGetTypeID'>
   <function name='CGContextPathContainsPoint'>
     <retval type='Z' />
     <arg type='^{CGContext=}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='i' />
   </function>
   <function name='CGContextRelease'>
   </function>
   <function name='CGContextSetFillColor'>
     <arg type='^{CGContext=}' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
   </function>
   <function name='CGContextSetFillColorSpace'>
     <arg type='^{CGContext=}' />
   <function name='CGContextSetFillPattern'>
     <arg type='^{CGContext=}' />
     <arg type='^{CGPattern=}' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
   </function>
   <function name='CGContextSetFlatness'>
     <arg type='^{CGContext=}' />
   <function name='CGContextSetLineDash'>
     <arg type='^{CGContext=}' />
     <arg type='f' type64='d' />
-    <arg c_array_length_in_arg='3' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_length_in_arg='3' type='^f' type64='^d' type_modifier='n' />
     <arg type='L' type64='L' />
   </function>
   <function name='CGContextSetLineJoin'>
   </function>
   <function name='CGContextSetPatternPhase'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
   </function>
   <function name='CGContextSetRGBFillColor'>
     <arg type='^{CGContext=}' />
   </function>
   <function name='CGContextSetShadow'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='f' type64='d' />
   </function>
   <function name='CGContextSetShadowWithColor'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='f' type64='d' />
     <arg type='^{CGColor=}' />
   </function>
   </function>
   <function name='CGContextSetStrokeColor'>
     <arg type='^{CGContext=}' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
   </function>
   <function name='CGContextSetStrokeColorSpace'>
     <arg type='^{CGContext=}' />
   <function name='CGContextSetStrokePattern'>
     <arg type='^{CGContext=}' />
     <arg type='^{CGPattern=}' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
   </function>
   <function name='CGContextSetTextDrawingMode'>
     <arg type='^{CGContext=}' />
   <function name='CGContextShowGlyphsAtPositions'>
     <arg type='^{CGContext=}' />
     <arg c_array_length_in_arg='3' type='^S' />
-    <arg c_array_length_in_arg='3' type='^{_NSPoint=ff}' type64='^{_NSPoint=dd}' />
+    <arg c_array_length_in_arg='3' type='^{CGPoint=ff}' type64='^{CGPoint=dd}' />
     <arg type='L' type64='L' />
   </function>
   <function name='CGContextShowGlyphsWithAdvances'>
     <arg type='^{CGContext=}' />
     <arg c_array_length_in_arg='3' type='^S' type_modifier='n' />
-    <arg c_array_length_in_arg='3' type='^{_NSSize=ff}' type64='^{_NSSize=dd}' type_modifier='n' />
+    <arg c_array_length_in_arg='3' type='^{CGSize=ff}' type64='^{CGSize=dd}' type_modifier='n' />
     <arg type='L' type64='L' />
   </function>
   <function name='CGContextShowText'>
   </function>
   <function name='CGContextStrokeEllipseInRect'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGContextStrokeLineSegments'>
     <arg type='^{CGContext=}' />
-    <arg c_array_length_in_arg='2' type='^{_NSPoint=ff}' type64='^{_NSPoint=dd}' type_modifier='n' />
+    <arg c_array_length_in_arg='2' type='^{CGPoint=ff}' type64='^{CGPoint=dd}' type_modifier='n' />
     <arg type='L' type64='L' />
   </function>
   <function name='CGContextStrokePath'>
   </function>
   <function name='CGContextStrokeRect'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGContextStrokeRectWithWidth'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='f' type64='d' />
   </function>
   <function name='CGContextSynchronize'>
     <arg type='I' />
   </function>
   <function name='CGDisplayBounds'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='I' />
   </function>
   <function name='CGDisplayBytesPerRow'>
   <function name='CGDisplayMoveCursorToPoint'>
     <retval type='i' />
     <arg type='I' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='CGDisplayPixelsHigh'>
     <retval type='L' type64='Q' />
     <arg type='I' />
   </function>
   <function name='CGDisplayScreenSize'>
-    <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <retval type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='I' />
   </function>
   <function name='CGDisplaySerialNumber'>
     <retval already_cfretained='true' type='^{__CGEvent=}' />
     <arg type='^{__CGEventSource=}' />
     <arg type='I' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='I' />
   </function>
   <function name='CGEventCreateScrollWheelEvent' variadic='true' c_array_length_in_arg='2'>
     <arg type='I' />
   </function>
   <function name='CGEventGetLocation'>
-    <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <retval type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='^{__CGEvent=}' />
   </function>
   <function name='CGEventGetTimestamp'>
     <retval type='L' type64='Q' />
   </function>
   <function name='CGEventGetUnflippedLocation'>
-    <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <retval type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='^{__CGEvent=}' />
   </function>
   <function name='CGEventKeyboardGetUnicodeString'>
   </function>
   <function name='CGEventSetLocation'>
     <arg type='^{__CGEvent=}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='CGEventSetSource'>
     <arg type='^{__CGEvent=}' />
     <arg type='^{CGFont=}' />
   </function>
   <function name='CGFontGetFontBBox'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGFont=}' />
   </function>
   <function name='CGFontGetGlyphAdvances'>
     <arg type='^{CGFont=}' />
     <arg c_array_length_in_arg='2' type='^S' type_modifier='n' />
     <arg type='L' type64='L' />
-    <arg c_array_length_in_arg='2' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='o' />
+    <arg c_array_length_in_arg='2' type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='o' />
   </function>
   <function name='CGFontGetGlyphWithGlyphName'>
     <retval type='S' />
     <retval already_cfretained='true' type='^{CGFunction=}' />
     <arg type='^v' type64='^v' />
     <arg type='L' type64='L' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
     <arg type='L' type64='L' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
     <arg type='r^{CGFunctionCallbacks=I^?^?}' type64='r^{CGFunctionCallbacks=I^?^?}' />
   </function>
   <function name='CGFunctionGetTypeID'>
   <function name='CGGLContextCreate'>
     <retval already_cfretained='true' type='^{CGContext=}' />
     <arg type='^v' type64='^v' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='^{CGColorSpace=}' />
   </function>
   <function name='CGGLContextUpdateViewportSize'>
     <arg type='^{CGContext=}' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
   </function>
   <function name='CGGetActiveDisplayList'>
     <retval type='i' />
   </function>
   <function name='CGGetDisplaysWithPoint'>
     <retval type='i' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='I' />
     <arg c_array_length_in_arg='1,3' type='^I' type_modifier='o' />
     <arg type='^I' type_modifier='o' />
   </function>
   <function name='CGGetDisplaysWithRect'>
     <retval type='i' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='I' />
     <arg c_array_length_in_arg='1,3' type='^I' type_modifier='o' />
     <arg type='^I' type_modifier='o' />
   <function name='CGGradientCreateWithColorComponents'>
     <retval already_cfretained='true' type='^{CGGradient=}' />
     <arg type='^{CGColorSpace=}' />
-    <arg c_array_length_in_arg='3' type='^f' type64='^f' type_modifier='n' />
-    <arg c_array_length_in_arg='3' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_length_in_arg='3' type='^f' type64='^d' type_modifier='n' />
+    <arg c_array_length_in_arg='3' type='^f' type64='^d' type_modifier='n' />
     <arg type='L' type64='L' />
   </function>
   <function name='CGGradientCreateWithColors'>
     <retval already_cfretained='true' type='^{CGGradient=}' />
     <arg type='^{CGColorSpace=}' />
     <arg type='^{__CFArray=}' />
-    <arg c_array_length_in_arg='1' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_length_in_arg='1' type='^f' type64='^d' type_modifier='n' />
   </function>
   <function name='CGGradientGetTypeID'>
     <retval type='L' type64='Q' />
     <arg type='^{CGColorSpace=}' />
     <arg type='I' />
     <arg type='^{CGDataProvider=}' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
     <arg type='Z' />
     <arg type='i' />
   </function>
   <function name='CGImageCreateWithImageInRect'>
     <retval already_cfretained='true' type='^{CGImage=}' />
     <arg type='^{CGImage=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGImageCreateWithJPEGDataProvider'>
     <retval already_cfretained='true' type='^{CGImage=}' />
     <arg type='^{CGDataProvider=}' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
     <arg type='Z' />
     <arg type='i' />
   </function>
   <function name='CGImageCreateWithMaskingColors'>
     <retval already_cfretained='true' type='^{CGImage=}' />
     <arg type='^{CGImage=}' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
   </function>
   <function name='CGImageCreateWithPNGDataProvider'>
     <retval already_cfretained='true' type='^{CGImage=}' />
     <arg type='^{CGDataProvider=}' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
     <arg type='Z' />
     <arg type='i' />
   </function>
     <arg type='L' type64='L' />
     <arg type='L' type64='L' />
     <arg type='^{CGDataProvider=}' />
-    <arg c_array_of_variable_length='true' type='^f' type64='^f' type_modifier='n' />
+    <arg c_array_of_variable_length='true' type='^f' type64='^d' type_modifier='n' />
     <arg type='Z' />
   </function>
   <function name='CGImageRelease'>
   <function name='CGLayerCreateWithContext'>
     <retval already_cfretained='true' type='^{CGLayer=}' />
     <arg type='^{CGContext=}' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='^{__CFDictionary=}' />
   </function>
   <function name='CGLayerGetContext'>
     <arg type='^{CGLayer=}' />
   </function>
   <function name='CGLayerGetSize'>
-    <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <retval type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='^{CGLayer=}' />
   </function>
   <function name='CGLayerGetTypeID'>
     <retval type='Z' />
     <arg type='^{CGPDFArray=}' />
     <arg type='L' type64='L' />
-    <arg type='^f' type64='^f' type_modifier='o' />
+    <arg type='^f' type64='^d' type_modifier='o' />
   </function>
   <function name='CGPDFArrayGetObject'>
     <retval type='Z' />
   <function name='CGPDFContextAddDestinationAtPoint'>
     <arg type='^{CGContext=}' />
     <arg type='^{__CFString=}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='CGPDFContextBeginPage'>
     <arg type='^{CGContext=}' />
   <function name='CGPDFContextCreate'>
     <retval already_cfretained='true' type='^{CGContext=}' />
     <arg type='^{CGDataConsumer=}' />
-    <arg type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='n' />
+    <arg type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg type='^{__CFDictionary=}' />
   </function>
   <function name='CGPDFContextCreateWithURL'>
     <retval already_cfretained='true' type='^{CGContext=}' />
     <arg type='^{__CFURL=}' />
-    <arg type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='n' />
+    <arg type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg type='^{__CFDictionary=}' />
   </function>
   <function name='CGPDFContextEndPage'>
   <function name='CGPDFContextSetDestinationForRect'>
     <arg type='^{CGContext=}' />
     <arg type='^{__CFString=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGPDFContextSetURLForRect'>
     <arg type='^{CGContext=}' />
     <arg type='^{__CFURL=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function comment='manual wrapper' name='CGPDFDictionaryApplyFunction'>
     <arg type='^{CGPDFDictionary=}' />
     <retval type='Z' />
     <arg type='^{CGPDFDictionary=}' />
     <arg numeric='false' type='r*' type64='r*' />
-    <arg type='^f' type64='^f' type_modifier='o' />
+    <arg type='^f' type64='^d' type_modifier='o' />
   </function>
   <function name='CGPDFDictionaryGetObject'>
     <retval type='Z' />
     <arg type='^{__CFURL=}' />
   </function>
   <function name='CGPDFDocumentGetArtBox'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGPDFDocument=}' />
     <arg type='i' />
   </function>
   <function name='CGPDFDocumentGetBleedBox'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGPDFDocument=}' />
     <arg type='i' />
   </function>
     <arg type='^{CGPDFDocument=}' />
   </function>
   <function name='CGPDFDocumentGetCropBox'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGPDFDocument=}' />
     <arg type='i' />
   </function>
     <arg type='^{CGPDFDocument=}' />
   </function>
   <function name='CGPDFDocumentGetMediaBox'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGPDFDocument=}' />
     <arg type='i' />
   </function>
     <arg type='i' />
   </function>
   <function name='CGPDFDocumentGetTrimBox'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGPDFDocument=}' />
     <arg type='i' />
   </function>
     <arg function_pointer='true' type='^?' type64='^?' />
   </function>
   <function name='CGPDFPageGetBoxRect'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGPDFPage=}' />
     <arg type='i' />
   </function>
     <retval type='{CGAffineTransform=ffffff}' type64='{CGAffineTransform=dddddd}' />
     <arg type='^{CGPDFPage=}' />
     <arg type='i' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='i' />
     <arg type='Z' />
   </function>
   <function name='CGPDFScannerPopNumber'>
     <retval type='Z' />
     <arg type='^{CGPDFScanner=}' />
-    <arg type='^f' type64='^f' type_modifier='o' />
+    <arg type='^f' type64='^d' type_modifier='o' />
   </function>
   <function name='CGPDFScannerPopObject'>
     <retval type='Z' />
   </function>
   <function name='CGPathAddArcToPoint'>
     <arg type='^{CGPath=}' />
-    <arg type='^{CGAffineTransform=ffffff}' type64='^{CGAffineTransform=dddddd}' type_modifier='n' />
+    <arg type='^{CGAffineTransform=ffffff}' type_modifier='n' />
     <arg type='f' type64='d' />
     <arg type='f' type64='d' />
     <arg type='f' type64='d' />
   <function name='CGPathAddEllipseInRect'>
     <arg type='^{CGPath=}' />
     <arg type='^{CGAffineTransform=ffffff}' type64='^{CGAffineTransform=dddddd}' type_modifier='n' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGPathAddLineToPoint'>
     <arg type='^{CGPath=}' />
   <function name='CGPathAddLines'>
     <arg type='^{CGPath=}' />
     <arg type='^{CGAffineTransform=ffffff}' type64='^{CGAffineTransform=dddddd}' type_modifier='n' />
-    <arg c_array_length_in_arg='3' type='^{_NSPoint=ff}' type64='^{_NSPoint=dd}' type_modifier='n' />
+    <arg c_array_length_in_arg='3' type='^{CGPoint=ff}' type64='^{CGPoint=dd}' type_modifier='n' />
     <arg type='L' type64='L' />
   </function>
   <function name='CGPathAddPath'>
   <function name='CGPathAddRect'>
     <arg type='^{CGPath=}' />
     <arg type='^{CGAffineTransform=ffffff}' type64='^{CGAffineTransform=dddddd}' type_modifier='n' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGPathAddRects'>
     <arg type='^{CGPath=}' />
     <arg type='^{CGAffineTransform=ffffff}' type64='^{CGAffineTransform=dddddd}' type_modifier='n' />
-    <arg c_array_length_in_arg='3' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='n' />
+    <arg c_array_length_in_arg='3' type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg type='L' type64='L' />
   </function>
   <function comment='manual wrapper' name='CGPathApply'>
   <function name='CGPathContainsPoint'>
     <retval type='Z' />
     <arg type='^{CGPath=}' />
-    <arg type='^{CGAffineTransform=ffffff}' type64='^{CGAffineTransform=dddddd}' type_modifier='n' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='^{CGAffineTransform=ffffff}' type_modifier='n' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='Z' />
   </function>
   <function name='CGPathCreateCopy'>
     <arg type='^{CGPath=}' />
   </function>
   <function name='CGPathGetBoundingBox'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{CGPath=}' />
   </function>
   <function name='CGPathGetCurrentPoint'>
-    <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <retval type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='^{CGPath=}' />
   </function>
   <function name='CGPathGetTypeID'>
   <function name='CGPathIsRect'>
     <retval type='Z' />
     <arg type='^{CGPath=}' />
-    <arg type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='o' />
+    <arg type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='o' />
   </function>
   <function name='CGPathMoveToPoint'>
     <arg type='^{CGPath=}' />
   <function comment='manual wrapper' name='CGPatternCreate'>
     <retval already_cfretained='true' type='^{CGPattern=}' />
     <arg type='^v' type64='^v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='{CGAffineTransform=ffffff}' type64='{CGAffineTransform=dddddd}' />
     <arg type='f' type64='d' />
     <arg type='f' type64='d' />
     <arg type='^{CGPattern=}' />
   </function>
   <function name='CGPointApplyAffineTransform'>
-    <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <retval type='{CGPoint=ff}' type64='{CGPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='{CGAffineTransform=ffffff}' type64='{CGAffineTransform=dddddd}' />
   </function>
   <function name='CGPointCreateDictionaryRepresentation'>
     <retval already_cfretained='true' type='^{__CFDictionary=}' type64='^{__CFDictionary=}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='CGPointEqualToPoint'>
     <retval type='Z' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='CGPointMakeWithDictionaryRepresentation'>
     <retval type='Z' />
     <arg type='^{__CFDictionary=}' />
-    <arg type='^{_NSPoint=ff}' type64='^{_NSPoint=dd}' type_modifier='o' />
+    <arg type='^{CGPoint=ff}' type64='^{CGPoint=dd}' type_modifier='o' />
   </function>
   <function name='CGPostKeyboardEvent'>
     <retval type='i' />
   </function>
   <function name='CGPostMouseEvent' variadic='true' c_array_length_in_arg='2'>
     <retval type='i' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='i' />
     <arg type='I' />
     <arg type='i' />
     <arg type='i' />
   </function>
   <function name='CGRectApplyAffineTransform'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='{CGAffineTransform=ffffff}' type64='{CGAffineTransform=dddddd}' />
   </function>
   <function name='CGRectContainsPoint'>
     <retval type='Z' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='CGRectContainsRect'>
     <retval type='Z' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectCreateDictionaryRepresentation'>
     <retval already_cfretained='true' type='^{__CFDictionary=}' type64='^{__CFDictionary=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectDivide'>
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='o' />
-    <arg type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='o' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='o' />
+    <arg type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='o' />
     <arg type='f' type64='d' />
     <arg type='i' />
   </function>
   <function name='CGRectEqualToRect'>
     <retval type='Z' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectGetHeight'>
     <retval type='f' type64='d' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectGetMaxX'>
     <retval type='f' type64='d' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectGetMaxY'>
     <retval type='f' type64='d' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectGetMidX'>
     <retval type='f' type64='d' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectGetMidY'>
     <retval type='f' type64='d' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectGetMinX'>
     <retval type='f' type64='d' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectGetMinY'>
     <retval type='f' type64='d' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectGetWidth'>
     <retval type='f' type64='d' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectInset'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='f' type64='d' />
     <arg type='f' type64='d' />
   </function>
   <function name='CGRectIntegral'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectIntersection'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectIntersectsRect'>
     <retval type='Z' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectIsEmpty'>
     <retval type='Z' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectIsInfinite'>
     <retval type='Z' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectIsNull'>
     <retval type='Z' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectMakeWithDictionaryRepresentation'>
     <retval type='Z' />
     <arg type='^{__CFDictionary=}' />
-    <arg type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='o' />
+    <arg type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='o' />
   </function>
   <function name='CGRectOffset'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='f' type64='d' />
     <arg type='f' type64='d' />
   </function>
   <function name='CGRectStandardize'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRectUnion'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function comment='manual wrapper' name='CGRegisterScreenRefreshCallback'>
     <retval type='i' />
     <arg type='I' />
   </function>
   <function comment='manual wrapper' name='CGReleaseScreenRefreshRects'>
-    <arg type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='CGRestorePermanentDisplayConfiguration' />
   <function comment='manual wrapper' name='CGScreenRegisterMoveCallback'>
   <function name='CGShadingCreateAxial'>
     <retval already_cfretained='true' type='^{CGShading=}' />
     <arg type='^{CGColorSpace=}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='^{CGFunction=}' />
     <arg type='Z' />
     <arg type='Z' />
   <function name='CGShadingCreateRadial'>
     <retval already_cfretained='true' type='^{CGShading=}' />
     <arg type='^{CGColorSpace=}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='f' type64='d' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='f' type64='d' />
     <arg type='^{CGFunction=}' />
     <arg type='Z' />
     <retval type='i' />
   </function>
   <function name='CGSizeApplyAffineTransform'>
-    <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <retval type='{CGSize=ff}' type64='{CGSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='{CGAffineTransform=ffffff}' type64='{CGAffineTransform=dddddd}' />
   </function>
   <function name='CGSizeCreateDictionaryRepresentation'>
     <retval already_cfretained='true' type='^{__CFDictionary=}' type64='^{__CFDictionary=}' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
   </function>
   <function name='CGSizeEqualToSize'>
     <retval type='Z' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
+    <arg type='{CGSize=ff}' type64='{CGSize=dd}' />
   </function>
   <function name='CGSizeMakeWithDictionaryRepresentation'>
     <retval type='Z' />
     <arg type='^{__CFDictionary=}' />
-    <arg type='^{_NSSize=ff}' type64='^{_NSSize=dd}' type_modifier='o' />
+    <arg type='^{CGSize=ff}' type64='^{CGSize=dd}' type_modifier='o' />
   </function>
   <function comment='manual wrapper' name='CGUnregisterScreenRefreshCallback'>
     <arg type='^?' type64='^?' />
   </function>
   <function comment='manual wrapper, array value returned by indirection' name='CGWaitForScreenRefreshRects'>
     <retval type='i' />
-    <arg c_array_length_in_arg='1' type='^^{_NSRect}' type_modifier='o' />
+    <arg c_array_length_in_arg='1' type='^^{CGRect}' type_modifier='o' />
     <arg type='^I' type_modifier='o' />
   </function>
   <function comment='manual wrapper, array value returned by indirection' name='CGWaitForScreenUpdateRects'>
     <retval type='i' />
     <arg type='I' />
     <arg type='^I' type_modifier='o' />
-    <arg c_array_length_in_arg='3' type='^^{_NSRect}' type_modifier='o' />
+    <arg c_array_length_in_arg='3' type='^^{CGRect}' type_modifier='o' />
     <arg type='^I' type64='^Q' />
     <arg type='^{_CGScreenUpdateMoveDelta=ii}' type64='^{_CGScreenUpdateMoveDelta=ii}' />
   </function>
   <function name='CGWarpMouseCursorPosition'>
     <retval type='i' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='CGWindowLevelForKey'>
     <retval type='i' />
   </function>
   <function name='CGWindowListCreateImage'>
     <retval already_cfretained='true' type='^{CGImage=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='I' />
     <arg type='I' />
     <arg type='I' />
   </function>
   <function name='CGWindowListCreateImageFromArray'>
     <retval already_cfretained='true' type='^{CGImage=}' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{__CFArray=}' />
     <arg type='I' />
   </function>
     <retval type='^{__CFMachPort=}' />
   </function>
   <function inline='true' name='CGPointMake'>
-    <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <retval type='{CGPoint=ff}' type64='{CGPoint=dd}' />
     <arg type='f' type64='d' />
     <arg type='f' type64='d' />
   </function>
   <function inline='true' name='CGRectMake'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='f' type64='d' />
     <arg type='f' type64='d' />
     <arg type='f' type64='d' />
     <arg type='f' type64='d' />
   </function>
   <function inline='true' name='CGSizeMake'>
-    <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <retval type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='f' type64='d' />
     <arg type='f' type64='d' />
   </function>

pyobjc-framework-Quartz/Lib/Quartz/CoreGraphics/__init__.py

 import objc as _objc
 from CoreFoundation import *
 
-# Make sure CGSize, CGPoint and CGRect are aliases
-# for the corresponding types in Foundation.
-from Foundation import NSSize  as CGSize
-from Foundation import NSPoint as CGPoint
-from Foundation import NSRect  as CGRect
-
 from Quartz.CoreGraphics._inlines import _inline_list_
 
 __bundle__ = _objc.initFrameworkWrapper("CoreGraphics",

pyobjc-framework-Quartz/Lib/Quartz/CoreVideo/PyObjC.bridgesupport

     <retval type='I' />
   </function>
   <function name='CVImageBufferGetCleanRect'>
-    <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='@' />
   </function>
   <function name='CVImageBufferGetColorSpace'>
     <arg type='@' />
   </function>
   <function name='CVImageBufferGetDisplaySize'>
-    <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <retval type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='@' />
   </function>
   <function name='CVImageBufferGetEncodedSize'>
-    <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <retval type='{CGSize=ff}' type64='{CGSize=dd}' />
     <arg type='@' />
   </function>
   <function name='CVOpenGLBufferAttach'>
   </function>
   <function name='CVPixelBufferGetExtendedPixels'>
     <arg type='@' />
-    <arg type='^I' type64='^I' type_modifier='o' />
-    <arg type='^I' type64='^I' type_modifier='o' />
-    <arg type='^I' type64='^I' type_modifier='o' />
-    <arg type='^I' type64='^I' type_modifier='o' />
+    <arg type='^I' type64='^L' type_modifier='o' />
+    <arg type='^I' type64='^L' type_modifier='o' />
+    <arg type='^I' type64='^L' type_modifier='o' />
+    <arg type='^I' type64='^L' type_modifier='o' />
   </function>
   <function name='CVPixelBufferGetHeight'>
     <retval type='L' type64='Q' />

pyobjc-framework-Quartz/Lib/Quartz/ImageKit/PyObjC.bridgesupport

   </class>
   <class name='IKImagePicker'>
     <method selector='beginImagePickerSheetForWindow:withDelegate:didEndSelector:contextInfo:'>
-      <arg index='2' type=':' sel_of_type='v@:@I^v' sel_of_type64='v@:@Q^v' />
+      <arg index='2' type=':' sel_of_type='v@:@I^v' sel_of_type64='v@:@Q^v'/>
       <arg index='3' type='^v' />
     </method>
     <method selector='beginImagePickerWithDelegate:didEndSelector:contextInfo:'>
-      <arg index='1' type=':' sel_of_type='v@:@I^v' sel_of_type64='v@:@Q^v' />
+      <arg index='1' type=':' sel_of_type='v@:@I^v' sel_of_type64='v@:@Q^v'/>
       <arg index='2' type='^v' />
     </method>
   </class>
   </class>
   <class name='IKPictureTaker'>
     <method selector='beginPictureTakerSheetForWindow:withDelegate:didEndSelector:contextInfo:'>
-      <arg index='2' type=':' sel_of_type='v@:@i^v' sel_of_type64='v@:@i^v'/>
+      <arg index='2' type=':' sel_of_type='v@:@i^v' sel_of_type64='v@:@q^v'/>
       <arg index='3' type='^v' />
     </method>
     <method selector='beginPictureTakerWithDelegate:didEndSelector:contextInfo:'>
-      <arg index='1' type=':' sel_of_type='v@:@i^v' sel_of_type64='v@:@i^v' />
+      <arg index='1' type=':' sel_of_type='v@:@i^v' sel_of_type64='v@:@q^v' />
       <arg index='2' type='^v' />
     </method>
     <method selector='mirroring'>
       <retval type='B' />
     </method>
     <method selector='popUpRecentsMenuForView:withDelegate:didEndSelector:contextInfo:'>
-      <arg index='2' type=':' sel_of_type='v@:@i^v' />
+      <arg index='2' type=':' sel_of_type='v@:@i^v' sel_of_type64='v@:@q^v'/>
       <arg index='3' type='^v' />
     </method>
     <method selector='setMirroring:'>
 	  </method>
     <method selector='canExportSlideshowItemAtIndex:toApplication:'>
       <retval type='B' />
-	    <arg index='0'  type='I' />
+	    <arg index='0'  type='I' type64='Q'/>
     </method>
     <method selector='image'>
       <retval type='^{CGImage=}' />
     </method>
     <method selector='thumbnailWithMaximumSize:'>
       <retval type='^{CGImage=}' />
-      <arg index='0' type='{_NSSize=ff}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}'/>
     </method>
     <method selector='slideshowItemAtIndex:'>
-	    <arg index='0'  type='I' />
+	    <arg index='0'  type='I' type64='Q'/>
     </method>
     <method selector='nameOfSlideshowItemAtIndex:'>
-	    <arg index='0'  type='I' />
+	    <arg index='0'  type='I' type64='Q'/>
     </method>
     <method selector='slideshowDidChangeCurrentIndex:'>
-	    <arg index='0'  type='I' />
+	    <arg index='0'  type='I' type64='Q'/>
     </method>
   </class>
 </signatures>

pyobjc-framework-Quartz/Lib/Quartz/QuartzCore/PyObjC.bridgesupport

   </function>
   <function name='CATransform3DMakeRotation'>
     <retval type='{CATransform3D=ffffffffffffffff}' type64='{CATransform3D=dddddddddddddddd}' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
   </function>
   <function name='CATransform3DMakeScale'>
     <retval type='{CATransform3D=ffffffffffffffff}' type64='{CATransform3D=dddddddddddddddd}' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
   </function>
   <function name='CATransform3DMakeTranslation'>
     <retval type='{CATransform3D=ffffffffffffffff}' type64='{CATransform3D=dddddddddddddddd}' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
   </function>
   <function name='CATransform3DRotate'>
     <retval type='{CATransform3D=ffffffffffffffff}' type64='{CATransform3D=dddddddddddddddd}' />
     <arg type='{CATransform3D=ffffffffffffffff}' type64='{CATransform3D=dddddddddddddddd}' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
   </function>
   <function name='CATransform3DScale'>
     <retval type='{CATransform3D=ffffffffffffffff}' type64='{CATransform3D=dddddddddddddddd}' />
     <arg type='{CATransform3D=ffffffffffffffff}' type64='{CATransform3D=dddddddddddddddd}' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
   </function>
   <function name='CATransform3DTranslate'>
     <retval type='{CATransform3D=ffffffffffffffff}' type64='{CATransform3D=dddddddddddddddd}' />
     <arg type='{CATransform3D=ffffffffffffffff}' type64='{CATransform3D=dddddddddddddddd}' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
-    <arg type='f' type64='f' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
+    <arg type='f' type64='d' />
   </function>
   <informal_protocol name='CAAnimationDelegate'>
     <method selector='animationDidStart:' type='v@:@' />
   <informal_protocol name='CALayoutManager'>
     <method selector='invalidateLayoutOfLayer:' type='v@:@' />
     <method selector='layoutSublayersOfLayer:' type='v@:@' />
-    <method selector='preferredSizeOfLayer:' type='{_NSSize=ff}@:@' type64='{_NSSize=dd}@:@' />
+    <method selector='preferredSizeOfLayer:' type='{CGSize=ff}@:@' type64='{CGSize=dd}@:@' />
   </informal_protocol>
   <informal_protocol name='CIImageProvider'>
     <method selector='provideImageData:bytesPerRow:origin:size:userInfo:' type='v@:^vLLL@' type64='v@:^vQQQ@' />
   </class>
   <class name='CIKernel'>
     <method selector='setROISelector:'>
-      <arg index='0' sel_of_type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:i{_NSRect={_NSPoint=ff}{_NSSize=ff}}@' />
+      <arg index='0' sel_of_type='{CGRect={CGPoint=ff}{CGSize=ff}}@:i{CGRect={CGPoint=ff}{CGSize=ff}}@' sel_of_type64='{CGRect={CGPoint=dd}{CGSize=dd}}@:i{CGRect={CGPoint=dd}{CGSize=dd}}@' />
     </method>
   </class>
   <class name='CIPlugIn'>

pyobjc-framework-Quartz/Lib/Quartz/QuickLookUI/PyObjC.bridgesupport

     <method selector='previewPanel:sourceFrameOnScreenForPreviewItem:'>
       <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
     </method>
+    <method selector='previewPanel:transitionImageForPreviewItem:contentRect:'>
+      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    </method>
   </class>
   <class name='QLPreviewPanel'>
     <method selector='enterFullScreenMode:withOptions:'>
     <method selector='sharedPreviewPanelExists'>
       <retval type='B' type64='B' />
     </method>
+    <method selector='isInFullScreenMode'>
+      <retval type='B' type64='B' />
+    </method>
   </class>
 </signatures>

pyobjc-framework-Quartz/Lib/Quartz/QuickLookUI/__init__.py

 import objc as _objc
 from AppKit import *
 from Foundation import *
-from QuickLook import *
+#from QuickLook import *
 
 __bundle__ = _objc.initFrameworkWrapper("QuickLookUI",
     frameworkIdentifier="com.apple.QuickLookUIFramework",
     frameworkPath=_objc.pathForFramework(
         "/System/Library/Frameworks/Quartz.framework/Frameworks/QuickLookUI.framework"),
-    globals=globals())
+    globals=globals(),
+    frameworkResourceName="Quartz.QuickLookUI",
+    )

pyobjc-framework-Quartz/Lib/Quartz/__init__.py

 
 try:
     from Quartz.QuickLookUI import *
-except ImportError:
+except ImportError, msg:
     pass

pyobjc-framework-Quartz/PyObjCTest/test_qlpreviewpanel.py

         self.assertResultIsBOOL(TestQLPreviewPanelHelper.acceptsPreviewPanelControl_)
         self.assertResultIsBOOL(TestQLPreviewPanelHelper.previewPanel_handleEvent_)
 
-        #previewPanel_sourceFrameOnScreenForPreviewItem_
-        #previewPanel_transitionImageForPreviewItem_contentRect_
-        self.fail("finishme")
+        self.assertResultHasType(TestQLPreviewPanelHelper.previewPanel_sourceFrameOnScreenForPreviewItem_, NSRect.__typestr__)
+        self.assertArgHasType(TestQLPreviewPanelHelper.previewPanel_transitionImageForPreviewItem_contentRect_, 2, NSRect.__typestr__)
 
 if __name__ == "__main__":
     main()

pyobjc-framework-Quartz/pyobjc_setup.py

 __all__ = ('setup', 'Extension', 'Command')
 
 import sys
-if sys.version_info[:2] < (3, 0):
-    import ez_setup
-    ez_setup.use_setuptools()
 
-    from setuptools.command.test import test as oc_test
-    from setuptools.command.build_py import build_py as oc_build_py
+try:
+    import setuptools
 
-    extra_args = {}
-
-
-else:
+except ImportError:
     import distribute_setup
     distribute_setup.use_setuptools()
 
-    from setuptools.command import test
-    from setuptools.command import build_py
+from setuptools.command import test
+from setuptools.command import build_py
 
-    from distutils import log
+from distutils import log
 
-    extra_args=dict(
-        use_2to3 = True,
-    )
+extra_args=dict(
+    use_2to3 = True,
+)
 
 
-    class oc_build_py (build_py.build_py):
-        def build_packages(self):
-            log.info("Overriding build_packages to copy PyObjCTest")
-            p = self.packages
-            self.packages = list(self.packages) + ['PyObjCTest']
-            try:
-                build_py.build_py.build_packages(self)
-            finally:
-                self.packages = p
+class oc_build_py (build_py.build_py):
+    def build_packages(self):
+        log.info("Overriding build_packages to copy PyObjCTest")
+        p = self.packages
+        self.packages = list(self.packages) + ['PyObjCTest']
+        try:
+            build_py.build_py.build_packages(self)
+        finally:
+            self.packages = p
 
 
 
-    class oc_test (test.test):
-        def run_tests(self):
-            import sys, os
+class oc_test (test.test):
+    def run_tests(self):
+        import sys, os
 
-            rootdir =  os.path.dirname(os.path.abspath(__file__))
-            if rootdir in sys.path:
-                sys.path.remove(rootdir)
+        rootdir =  os.path.dirname(os.path.abspath(__file__))
+        if rootdir in sys.path:
+            sys.path.remove(rootdir)
 
-            import PyObjCTest
-            import unittest
-            from pkg_resources import EntryPoint
-            loader_ep = EntryPoint.parse("x="+self.test_loader)
-            loader_class = loader_ep.load(require=False)
+        import PyObjCTest
+        import unittest
+        from pkg_resources import EntryPoint
+        loader_ep = EntryPoint.parse("x="+self.test_loader)
+        loader_class = loader_ep.load(require=False)
 
-            unittest.main(None, None, [unittest.__file__]+self.test_args, testLoader=loader_class())
+        unittest.main(None, None, [unittest.__file__]+self.test_args, testLoader=loader_class())
 
 
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.