Ronald Oussoren avatar Ronald Oussoren committed 6792b25

* Revert previous NSRect encoding change
* Fix some bugs
- test_cfstring.py still fails intermittently in 64-bit mode (to more
precise is passes intermittently), but works without problems in 32-bit
mode. I haven't tried to reproduce this in plain ObjC yet.

Comments (0)

Files changed (6)

pyobjc-framework-Cocoa/Lib/AppKit/PyObjC.bridgesupport

   <function name='NSCopyBits'>
     <retval type='v' type64='v' />
     <arg type='i' type64='q' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='NSCountWindows'>
     <retval type='v' type64='v' />
   </function>
   <function name='NSDottedFrameRect'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSDrawBitmap'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='i' type64='q' />
     <arg type='i' type64='q' />
     <arg type='i' type64='q' />
   </function>
   <function name='NSDrawButton'>
     <retval type='v' type64='v' />
-    <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='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSDrawColorTiledRects'>
-    <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='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg c_array_length_in_arg='4' type='^i' type64='^q' type_modifier='n' />
     <arg c_array_length_in_arg='4' type='^@' type_modifier='n' />
     <arg type='i' type64='q' />
   </function>
   <function name='NSDrawDarkBezel'>
     <retval type='v' type64='v' />
-    <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='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSDrawGrayBezel'>
     <retval type='v' type64='v' />
-    <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='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSDrawGroove'>
     <retval type='v' type64='v' />
-    <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='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSDrawLightBezel'>
     <retval type='v' type64='v' />
-    <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='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSDrawNinePartImage'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='@' type64='@' />
     <arg type='@' type64='@' />
     <arg type='@' type64='@' />
   </function>
   <function name='NSDrawThreePartImage'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='@' type64='@' />
     <arg type='@' type64='@' />
     <arg type='@' type64='@' />
     <arg type='B' type64='B' />
   </function>
   <function name='NSDrawTiledRects'>
-    <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='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg c_array_length_in_arg='4' type='^i' type64='^q' type_modifier='n' />
     <arg c_array_length_in_arg='4' type='^f' type64='^f' type_modifier='n' />
     <arg type='i' type64='q' />
   </function>
   <function name='NSDrawWhiteBezel'>
     <retval type='v' type64='v' />
-    <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='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSDrawWindowBackground'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSEnableScreenUpdates'>
     <retval type='v' type64='v' />
   </function>
   <function name='NSEraseRect'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSFrameRect'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSFrameRectWithWidth'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='f' type64='d' />
   </function>
   <function name='NSFrameRectWithWidthUsingOperation'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='f' type64='d' />
     <arg type='I' />
   </function>
   </function>
   <function name='NSHighlightRect'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSInterfaceStyleForKey'>
     <retval type='I' />
   </function>
   <function name='NSReadPixel'>
     <retval type='@' type64='@' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+    <arg type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='NSRectClip'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSRectClipList'>
     <retval type='v' type64='v' />
-    <arg c_array_length_in_arg='1' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='n' />
+    <arg c_array_length_in_arg='1' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg type='i' type64='q' />
   </function>
   <function name='NSRectFill'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </function>
   <function name='NSRectFillList'>
     <retval type='v' type64='v' />
-    <arg c_array_length_in_arg='1' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='n' />
+    <arg c_array_length_in_arg='1' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg type='i' type64='q' />
   </function>
   <function name='NSRectFillListUsingOperation'>
     <retval type='v' type64='v' />
-    <arg c_array_length_in_arg='1' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' type_modifier='n' />
+    <arg c_array_length_in_arg='1' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg type='i' type64='q' />
     <arg type='I' />
   </function>
   <function name='NSRectFillListWithColors'>
     <retval type='v' type64='v' />
-    <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='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg c_array_length_in_arg='2' type='^@' type_modifier='n' />
     <arg type='i' type64='q' />
   </function>
   <function name='NSRectFillListWithColorsUsingOperation'>
     <retval type='v' type64='v' />
-    <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='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg c_array_length_in_arg='2' type='^@' type_modifier='n' />
     <arg type='i' type64='q' />
     <arg type='I' />
   </function>
   <function name='NSRectFillListWithGrays'>
     <retval type='v' type64='v' />
-    <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='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='n' />
     <arg c_array_length_in_arg='2' type='^f' type64='^f' type_modifier='n' />
     <arg type='i' type64='q' />
   </function>
   <function name='NSRectFillUsingOperation'>
     <retval type='v' type64='v' />
-    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <arg type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='I' />
   </function>
   <function name='NSRegisterServicesProvider'>
   <function name='NSShowAnimationEffect'>
     <retval type='v' type64='v' />
     <arg type='I' />
-    <arg type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-    <arg type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+    <arg type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+    <arg type='{_NSSize=ff}' type64='{CGSize=dd}' />
     <arg type='@' type64='@' />
     <arg sel_of_type='v@:^v' type=':' />
     <arg type='^v' type64='^v' />
     <method selector='accessibilityAttributeValue:forParameter:' type='@@:@@' />
     <method selector='accessibilityFocusedUIElement' type='@@:' />
     -->
-    <method selector='accessibilityHitTest:' type='@@:{_NSPoint=ff}' type64='@@:{_NSPoint=dd}' />
+    <method selector='accessibilityHitTest:' type='@@:{_NSPoint=ff}' type64='@@:{CGPoint=dd}' />
     <method selector='accessibilityIsAttributeSettable:' type='B@:@' />
     <method selector='accessibilityIsIgnored' type='B@:' />
     <!--
     <method selector='browser:acceptDrop:atRow:column:dropOperation:' type='B@:@@iiI' />
     <method selector='browser:canDragRowsWithIndexes:inColumn:withEvent:' type='B@:@@i@' type64='B@:@@q@' />
     <method selector='browser:createRowsForColumn:inMatrix:' type='v@:@i@' type64='v@:@q@' />
-    <method selector='browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:' type='@@:@@i@^{_NSPoint=ff}' type64='@@:@@q@^{_NSPoint=dd}' />
+    <method selector='browser:draggingImageForRowsWithIndexes:inColumn:withEvent:offset:' type='@@:@@i@^{_NSPoint=ff}' type64='@@:@@q@^{CGPoint=dd}' />
     <method selector='browser:isColumnValid:' type='B@:@i' type64='B@:@q' />
     <method selector='browser:namesOfPromisedFilesDroppedAtDestination:forDraggedRowsWithIndexes:inColumn:' type='@@:@@@i' type64='@@:@@@q' />
     <method selector='browser:nextTypeSelectMatchFromRow:toRow:inColumn:forString:' type='i@:@iii@' type64='q@:@qqq@' />
     <method selector='wantsPeriodicDraggingUpdates' type='B@:' />
   </informal_protocol>
   <informal_protocol name='NSDraggingSource'>
-    <method selector='draggedImage:beganAt:' type='v@:@{_NSPoint=ff}' type64='v@:@{_NSPoint=dd}' />
-    <method selector='draggedImage:endedAt:deposited:' type='v@:@{_NSPoint=ff}B' type64='v@:@{_NSPoint=dd}B' />
-    <method selector='draggedImage:endedAt:operation:' type='v@:@{_NSPoint=ff}I' type64='v@:@{_NSPoint=dd}I' />
-    <method selector='draggedImage:movedTo:' type='v@:@{_NSPoint=ff}' type64='v@:@{_NSPoint=dd}' />
+    <method selector='draggedImage:beganAt:' type='v@:@{_NSPoint=ff}' type64='v@:@{CGPoint=dd}' />
+    <method selector='draggedImage:endedAt:deposited:' type='v@:@{_NSPoint=ff}B' type64='v@:@{CGPoint=dd}B' />
+    <method selector='draggedImage:endedAt:operation:' type='v@:@{_NSPoint=ff}I' type64='v@:@{CGPoint=dd}I' />
+    <method selector='draggedImage:movedTo:' type='v@:@{_NSPoint=ff}' type64='v@:@{CGPoint=dd}' />
     <method selector='draggingSourceOperationMaskForLocal:' type='I@:B' type64='Q@:B'/>
     <method selector='ignoreModifierKeysWhileDragging' type='B@:' />
     <!-- <method selector='namesOfPromisedFilesDroppedAtDestination:' type='@@:@' /> -->
   <informal_protocol name='NSDrawerDelegate'>
     <method selector='drawerShouldClose:' type='B@:@' />
     <method selector='drawerShouldOpen:' type='B@:@' />
-    <method selector='drawerWillResizeContents:toSize:' type='{_NSSize=ff}@:@{_NSSize=ff}' type64='{_NSSize=dd}@:@{_NSSize=dd}' />
+    <method selector='drawerWillResizeContents:toSize:' type='{_NSSize=ff}@:@{_NSSize=ff}' type64='{CGSize=dd}@:@{CGSize=dd}' />
   </informal_protocol>
   <informal_protocol name='NSDrawerNotifications'>
     <method selector='drawerDidClose:' type='v@:@' />
     <method selector='image:didLoadRepresentation:withStatus:' type='v@:@@I' type64='v@:@@Q'/>
     <method selector='image:didLoadRepresentationHeader:' type='v@:@@' />
     <method selector='image:willLoadRepresentation:' type='v@:@@' />
-    <method selector='imageDidNotDraw:inRect:' type='@@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='@@:@{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <method selector='imageDidNotDraw:inRect:' type='@@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='@@:@{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </informal_protocol>
   <informal_protocol name='NSKeyValueBindingCreation'>
     <method selector='bind:toObject:withKeyPath:options:' type='v@:@@@@' />
     <method selector='outlineView:shouldShowCellExpansionForTableColumn:item:' type='B@:@@@' />
     <method selector='outlineView:shouldTrackCell:forTableColumn:item:' type='B@:@@@@' />
     <method selector='outlineView:shouldTypeSelectForEvent:withCurrentSearchString:' type='B@:@@@' />
-    <method selector='outlineView:toolTipForCell:rect:tableColumn:item:mouseLocation:' type='@@:@@^{_NSRect={_NSPoint=ff}{_NSSize=ff}}@@{_NSPoint=ff}' type64='@@:@@^{_NSRect={_NSPoint=dd}{_NSSize=dd}}@@{_NSPoint=dd}' />
+    <method selector='outlineView:toolTipForCell:rect:tableColumn:item:mouseLocation:' type='@@:@@^{_NSRect={_NSPoint=ff}{_NSSize=ff}}@@{_NSPoint=ff}' type64='@@:@@^{CGRect={CGPoint=dd}{CGSize=dd}}@@{CGPoint=dd}' />
     <!-- <method selector='outlineView:typeSelectStringForTableColumn:item:' type='@@:@@@' /> -->
     <method selector='outlineView:willDisplayCell:forTableColumn:item:' type='v@:@@@@' />
     <method selector='outlineView:willDisplayOutlineCell:forTableColumn:item:' type='v@:@@@@' />
   </informal_protocol>
   <informal_protocol name='NSSplitViewDelegate'>
     <method selector='splitView:shouldAdjustSizeOfSubview:' type='B@:@@' type64='B@:@@' />
-    <method selector='splitView:additionalEffectiveRectOfDividerAtIndex:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@i' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}@:@q' />
+    <method selector='splitView:additionalEffectiveRectOfDividerAtIndex:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@i' type64='{CGRect={CGPoint=dd}{CGSize=dd}}@:@q' />
     <method selector='splitView:canCollapseSubview:' type='B@:@@' />
-    <method selector='splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}{_NSRect={_NSPoint=ff}{_NSSize=ff}}i' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}@:@{_NSRect={_NSPoint=dd}{_NSSize=dd}}{_NSRect={_NSPoint=dd}{_NSSize=dd}}q' />
+    <method selector='splitView:effectiveRect:forDrawnRect:ofDividerAtIndex:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}{_NSRect={_NSPoint=ff}{_NSSize=ff}}i' type64='{CGRect={CGPoint=dd}{CGSize=dd}}@:@{CGRect={CGPoint=dd}{CGSize=dd}}{CGRect={CGPoint=dd}{CGSize=dd}}q' />
     <method selector='splitView:constrainMaxCoordinate:ofSubviewAt:' type='f@:@fi' type64='d@:@dq' />
     <method selector='splitView:constrainMinCoordinate:ofSubviewAt:' type='f@:@fi' type64='d@:@dq' />
     <method selector='splitView:constrainSplitPosition:ofSubviewAt:' type='f@:@fi' type64='d@:@dq' />
-    <method selector='splitView:resizeSubviewsWithOldSize:' type='v@:@{_NSSize=ff}' type64='v@:@{_NSSize=dd}' />
+    <method selector='splitView:resizeSubviewsWithOldSize:' type='v@:@{_NSSize=ff}' type64='v@:@{CGSize=dd}' />
     <method selector='splitView:shouldCollapseSubview:forDoubleClickOnDividerAtIndex:' type='B@:@@i' type64='B@:@@q' />
     <method selector='splitView:shouldHideDividerAtIndex:' type='B@:@i' type64='B@:@q' />
     <method selector='splitViewDidResizeSubviews:' type='v@:@' />
     <method selector='tableView:shouldShowCellExpansionForTableColumn:row:' type='B@:@@i' type64='B@:@@q' />
     <method selector='tableView:shouldTrackCell:forTableColumn:row:' type='B@:@@@i' type64='B@:@@@q' />
     <method selector='tableView:shouldTypeSelectForEvent:withCurrentSearchString:' type='B@:@@@' />
-    <method selector='tableView:toolTipForCell:rect:tableColumn:row:mouseLocation:' type='@@:@@^{_NSRect={_NSPoint=ff}{_NSSize=ff}}@i{_NSPoint=ff}' type64='@@:@@^{_NSRect={_NSPoint=dd}{_NSSize=dd}}@q{_NSPoint=dd}' />
+    <method selector='tableView:toolTipForCell:rect:tableColumn:row:mouseLocation:' type='@@:@@^{_NSRect={_NSPoint=ff}{_NSSize=ff}}@i{_NSPoint=ff}' type64='@@:@@^{CGRect={CGPoint=dd}{CGSize=dd}}@q{CGPoint=dd}' />
     <method selector='tableView:typeSelectStringForTableColumn:row:' type='@@:@@i' type64='@@:@@q' />
     <method selector='tableView:willDisplayCell:forTableColumn:row:' type='v@:@@@i' type64='v@:@@@q' />
   </informal_protocol>
     <method selector='textStorageWillProcessEditing:' type='v@:@' />
   </informal_protocol>
   <informal_protocol name='NSTextViewDelegate'>
-    <method selector='textView:clickedOnCell:inRect:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@@{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <method selector='textView:clickedOnCell:inRect:atIndex:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}I' type64='v@:@@{_NSRect={_NSPoint=dd}{_NSSize=dd}}Q' />
+    <method selector='textView:clickedOnCell:inRect:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@@{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <method selector='textView:clickedOnCell:inRect:atIndex:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}I' type64='v@:@@{CGRect={CGPoint=dd}{CGSize=dd}}Q' />
     <method selector='textView:clickedOnLink:' type='B@:@@' />
     <method selector='textView:clickedOnLink:atIndex:' type='B@:@@I' type64='B@:@@Q' />
     <method selector='textView:completions:forPartialWordRange:indexOfSelectedItem:' type='@@:@@{_NSRange=II}^i' type64='@@:@@{_NSRange=QQ}^q' />
     <method selector='textView:doCommandBySelector:' type='B@:@:' />
-    <method selector='textView:doubleClickedOnCell:inRect:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@@{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <method selector='textView:doubleClickedOnCell:inRect:atIndex:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}I' type64='v@:@@{_NSRect={_NSPoint=dd}{_NSSize=dd}}Q' />
-    <method selector='textView:draggedCell:inRect:event:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}@' type64='v@:@@{_NSRect={_NSPoint=dd}{_NSSize=dd}}@' />
-    <method selector='textView:draggedCell:inRect:event:atIndex:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}@I' type64='v@:@@{_NSRect={_NSPoint=dd}{_NSSize=dd}}@Q' />
+    <method selector='textView:doubleClickedOnCell:inRect:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='v@:@@{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <method selector='textView:doubleClickedOnCell:inRect:atIndex:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}I' type64='v@:@@{CGRect={CGPoint=dd}{CGSize=dd}}Q' />
+    <method selector='textView:draggedCell:inRect:event:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}@' type64='v@:@@{CGRect={CGPoint=dd}{CGSize=dd}}@' />
+    <method selector='textView:draggedCell:inRect:event:atIndex:' type='v@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}@I' type64='v@:@@{CGRect={CGPoint=dd}{CGSize=dd}}@Q' />
     <method selector='textView:menu:forEvent:atIndex:' type='@@:@@@I' type64='@@:@@@Q' />
     <method selector='textView:shouldChangeTextInRange:replacementString:' type='B@:@{_NSRange=II}@' type64='B@:@{_NSRange=QQ}@' />
     <method selector='textView:shouldChangeTextInRanges:replacementStrings:' type='B@:@@@' />
     <method selector='toolbarWillAddItem:' type='v@:@' />
   </informal_protocol>
   <informal_protocol name='NSWindowDelegate'>
-    <method selector='window:shouldDragDocumentWithEvent:from:withPasteboard:' type='B@:@@{_NSPoint=ff}@' type64='B@:@@{_NSPoint=dd}@' />
+    <method selector='window:shouldDragDocumentWithEvent:from:withPasteboard:' type='B@:@@{_NSPoint=ff}@' type64='B@:@@{CGPoint=dd}@' />
     <method selector='window:shouldPopUpDocumentPathMenu:' type='B@:@@' />
-    <method selector='window:willPositionSheet:usingRect:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}@:@@{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <method selector='window:willPositionSheet:usingRect:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}@:@@{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <method selector='windowShouldClose:' type='B@:@' />
-    <method selector='windowShouldZoom:toFrame:' type='B@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='B@:@{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-    <method selector='windowWillResize:toSize:' type='{_NSSize=ff}@:@{_NSSize=ff}' type64='{_NSSize=dd}@:@{_NSSize=dd}' />
+    <method selector='windowShouldZoom:toFrame:' type='B@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='B@:@{CGRect={CGPoint=dd}{CGSize=dd}}' />
+    <method selector='windowWillResize:toSize:' type='{_NSSize=ff}@:@{_NSSize=ff}' type64='{CGSize=dd}@:@{CGSize=dd}' />
     <!-- <method selector='windowWillReturnFieldEditor:toObject:' type='@@:@@' />
     <method selector='windowWillReturnUndoManager:' type='@@:@' /> -->
-    <method selector='windowWillUseStandardFrame:defaultFrame:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}@:@{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+    <method selector='windowWillUseStandardFrame:defaultFrame:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}@:@{CGRect={CGPoint=dd}{CGSize=dd}}' />
   </informal_protocol>
   <informal_protocol name='NSWindowNotifications'>
     <method selector='windowDidBecomeKey:' type='v@:@' />
   </informal_protocol>
   <class name='CIImage'>
     <method selector='drawAtPoint:fromRect:operation:fraction:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawInRect:fromRect:operation:fraction:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
   </class>
   <class name='NSATSTypesetter'>
       <retval type='B' />
     </method>
     <method selector='boundingBoxForControlGlyphAtIndex:forTextContainer:proposedLineFragment:glyphPosition:characterIndex:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='3' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='3' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='characterRangeForGlyphRange:actualGlyphRange:'>
       <retval type='{_NSRange=II}' type64='{_NSRange=QQ}' />
       <arg index='0' type_modifier='o' />
       <arg index='1' type_modifier='o' />
       <arg index='2' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='3' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='3' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='glyphRangeForCharacterRange:actualCharacterRange:'>
       <retval type='{_NSRange=II}' type64='{_NSRange=QQ}' />
       <arg index='0' type_modifier='N' />
     </method>
     <method selector='lineFragmentRectForProposedRect:remainingRect:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='1' type_modifier='o' />
     </method>
     <method selector='lineSpacingAfterGlyphAtIndex:withProposedLineFragmentRect:'>
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='paragraphGlyphRange'>
       <retval type='{_NSRange=II}' type64='{_NSRange=QQ}' />
       <retval type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='paragraphSpacingAfterGlyphAtIndex:withProposedLineFragmentRect:'>
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='paragraphSpacingBeforeGlyphAtIndex:withProposedLineFragmentRect:'>
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='setAttachmentSize:forGlyphRange:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
       <arg index='1' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='setBidiLevels:forGlyphRange:'>
       <arg index='1' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='setLineFragmentRect:forGlyphRange:usedRect:baselineOffset:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='1' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='3' type='f' type64='d' />
     </method>
     <method selector='setLocation:withAdvancements:forStartOfGlyphRange:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
       <arg index='1' type_modifier='n' />
       <arg index='2' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
       <retval type='B' />
     </method>
     <method selector='willSetLineFragmentRect:forGlyphRange:usedRect:baselineOffset:'>
-      <arg index='0' type_modifier='N' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type_modifier='N' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='1' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='2' type_modifier='N' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='2' type_modifier='N' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='3' type_modifier='N' type='^f' type64='^d' />
     </method>
   </class>
       <arg index='1' type_modifier='o' />
     </method>
     <method selector='boundingRectWithSize:options:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='containsAttachments'>
       <retval type='B' />
       <retval type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='drawAtPoint:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='drawInRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawWithRect:options:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='fileWrapperFromRange:documentAttributes:error:'>
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='size'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
   </class>
   <class name='NSBezierPath'>
     <method selector='appendBezierPathWithArcFromPoint:toPoint:radius:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='appendBezierPathWithArcWithCenter:radius:startAngle:endAngle:clockwise:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
       <arg index='4' type='B' />
     </method>
     <method selector='appendBezierPathWithGlyphs:count:inFont:'>
       <arg c_array_length_in_arg='1' index='0' type_modifier='n' />
     </method>
     <method selector='appendBezierPathWithOvalInRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='appendBezierPathWithPackedGlyphs:'>
       <arg c_array_length_in_arg='1' index='0' type='^v' type_modifier='n' />
       <arg index='0' type_modifier='n' c_array_length_in_arg='1'/>
     </method>
     <method selector='appendBezierPathWithRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='appendBezierPathWithRoundedRect:xRadius:yRadius:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method class_method='true' selector='bezierPathWithOvalInRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method class_method='true' selector='bezierPathWithRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method class_method='true' selector='bezierPathWithRoundedRect:xRadius:yRadius:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='bounds'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='cachesBezierPath'>
       <retval type='B' />
     </method>
     <method class_method='true' selector='clipRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='closePath'>
     </method>
     <method selector='containsPoint:'>
       <retval type='B' />
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='controlPointBounds'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='currentPoint'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='curveToPoint:controlPoint1:controlPoint2:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='2' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='2' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method class_method='true' selector='drawPackedGlyphs:atPoint:'>
       <arg index='0' type='^v' type_modifier='n' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='elementAtIndex:associatedPoints:'>
       <arg c_array_of_variable_length='true' index='1' type_modifier='o' />
     </method>
     <method class_method='true' selector='fillRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='getLineDash:count:phase:'>
       <arg c_array_length_in_arg='1' index='0' type_modifier='o' />
       <retval type='B' />
     </method>
     <method selector='lineToPoint:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='moveToPoint:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='relativeCurveToPoint:controlPoint1:controlPoint2:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='2' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='2' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='relativeLineToPoint:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='relativeMoveToPoint:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='setAssociatedPoints:atIndex:'>
       <arg c_array_of_variable_length='true' index='0' />
       <arg c_array_length_in_arg='1' index='0' type_modifier='n' />
     </method>
     <method class_method='true' selector='strokeLineFromPoint:toPoint:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method class_method='true' selector='strokeRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
   </class>
   <class name='NSBitmapImageRep'>
       <arg index='0' type='^{CGImage=}' />
     </method>
     <method selector='initWithFocusedViewRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='isPlanar'>
       <retval type='B' />
   </class>
   <class name='NSBox'>
     <method selector='borderRect'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='contentViewMargins'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='isTransparent'>
       <retval type='B' />
     </method>
     <method selector='setContentViewMargins:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setFrameFromContentFrame:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='setTransparent:'>
       <arg index='0' type='B' />
     </method>
     <method selector='titleRect'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
   </class>
   <class name='NSBrowser'>
       <arg index='3' type_modifier='N' />
     </method>
     <method selector='drawTitleOfColumn:inRect:'>
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='frameOfColumn:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='frameOfInsideOfColumn:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='hasHorizontalScroller'>
       <retval type='B' />
       <retval type='B' />
     </method>
     <method selector='titleFrameOfColumn:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
   </class>
   <class name='NSBrowserCell'>
   </class>
   <class name='NSButtonCell'>
     <method selector='drawBezelWithFrame:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawImage:withFrame:inView:'>
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawTitle:withFrame:inView:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='getPeriodicDelay:interval:'>
       <arg index='0' type_modifier='o' />
   </class>
   <class name='NSCachedImageRep'>
     <method selector='initWithSize:depth:separate:alpha:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
       <arg index='2' type='B' />
       <arg index='3' type='B' />
     </method>
     <method selector='initWithWindow:rect:'>
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='rect'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
   </class>
   <class name='NSCell'>
       <retval type='B' />
     </method>
     <method selector='calcDrawInfo:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='cellSize'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='cellSizeForBounds:'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='continueTracking:at:inView:'>
       <retval type='B' />
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='drawInteriorWithFrame:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawWithExpansionFrame:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawWithFrame:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawingRectForBounds:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='editWithFrame:inView:editor:delegate:event:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='expansionFrameWithFrame:inView:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='getPeriodicDelay:interval:'>
       <arg index='0' type_modifier='o' />
     </method>
     <method selector='highlight:withFrame:inView:'>
       <arg index='0' type='B' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='highlightColorWithFrame:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='hitTestForEvent:inRect:ofView:'>
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='imageRectForBounds:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='importsGraphics'>
       <retval type='B' />
       <retval type='B' />
     </method>
     <method selector='menuForEvent:inRect:ofView:'>
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method class_method='true' selector='prefersTrackingUntilMouseUp'>
       <retval type='B' />
       <retval type='B' />
     </method>
     <method selector='resetCursorRect:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='selectWithFrame:inView:editor:delegate:start:length:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='sendsActionOnEndEditing'>
       <retval type='B' />
     </method>
     <method selector='startTrackingAt:inView:'>
       <retval type='B' />
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='stopTracking:at:inView:mouseIsUp:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
       <arg index='3' type='B' />
     </method>
     <method selector='titleRectForBounds:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='trackMouse:inRect:ofView:untilMouseUp:'>
       <retval type='B' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='3' type='B' />
     </method>
     <method selector='wantsNotificationForMarkedText'>
       <retval type='B' />
     </method>
     <method selector='documentRect'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='documentVisibleRect'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawsBackground'>
       <retval type='B' />
     </method>
     <method selector='onstrainScrollPoint:'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='scrollToPoint:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='setCopiesOnScroll:'>
       <arg index='0' type='B' />
 		  <arg index='1' type='B' />
 	  </method>
 	  <method selector='draggingImageForItemsAtIndexes:withEvent:offset:'>
-		  <arg index='2' type_modifier='N' type='^{_NSPoint=ff}' type64='^{_NSPoint=dd}' />
+		  <arg index='2' type_modifier='N' />
 	  </method>
     <method selector='frameForItemAtIndex:' >
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='allowsMultipleSelection'>
       <retval type='B' />
       <retval type='B' />
     </method>
     <method selector='maxItemSize'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='minItemSize'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setAllowsMultipleSelection:'>
       <arg index='0' type='B' />
     </method>
     <method selector='setMaxItemSize:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setMinItemSize:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setSelectable:'>
       <arg index='0' type='B' />
       <arg c_array_length_in_arg='2' index='1' type_modifier='n' />
     </method>
     <method selector='drawSwatchInRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='getComponents:'>
       <arg index='0' type='^f' type64='^d' type_modifier='o' c_array_of_variable_length='true' />
   </class>
   <class name='NSColorPicker'>
     <method selector='minContentSize'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
   </class>
   <class name='NSColorSpace'>
       <arg index='0' type='B' />
     </method>
     <method selector='drawWellInside:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='isActive'>
       <retval type='B' />
       <retval type='B' />
     </method>
     <method selector='intercellSpacing'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='isButtonBordered'>
       <retval type='B' />
       <arg index='0' type='B' />
     </method>
     <method selector='setIntercellSpacing:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setUsesDataSource:'>
       <arg index='0' type='B' />
       <retval type='B' />
     </method>
     <method selector='intercellSpacing'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='isButtonBordered'>
       <retval type='B' />
       <arg index='0' type='B' />
     </method>
     <method selector='setIntercellSpacing:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setUsesDataSource:'>
       <arg index='0' type='B' />
       <retval type='B' />
     </method>
     <method selector='initWithFrame:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='isContinuous'>
       <retval type='B' />
   </class>
   <class name='NSCursor'>
     <method selector='hotSpot'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='initWithImage:foregroundColorHint:backgroundColorHint:hotSpot:'>
-      <arg index='3' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='3' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='initWithImage:hotSpot:'>
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='isSetOnMouseEntered'>
       <retval type='B' />
       <retval type='B' />
     </method>
     <method selector='size'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
   </class>
   <class name='NSDocument'>
   </class>
   <class name='NSDrawer'>
     <method selector='contentSize'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='initWithContentSize:preferredEdge:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='maxContentSize'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='minContentSize'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setContentSize:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setMaxContentSize:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setMinContentSize:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
   </class>
   <class name='NSEPSImageRep'>
     <method selector='boundingBox'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
   </class>
   <class name='NSEvent'>
 		  </arg>
 	  </method>
     <method class_method='true' selector='enterExitEventWithType:location:modifierFlags:timestamp:windowNumber:context:eventNumber:trackingNumber:userData:'>
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='isARepeat'>
       <retval type='B' />
       <retval type='B' />
     </method>
     <method class_method='true' selector='keyEventWithType:location:modifierFlags:timestamp:windowNumber:context:characters:charactersIgnoringModifiers:isARepeat:keyCode:'>
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
       <arg index='8' type='B' />
     </method>
     <method selector='locationInWindow'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method class_method='true' selector='mouseEventWithType:location:modifierFlags:timestamp:windowNumber:context:eventNumber:clickCount:pressure:'>
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method class_method='true' selector='mouseLocation'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method class_method='true' selector='otherEventWithType:location:modifierFlags:timestamp:windowNumber:context:subtype:data1:data2:'>
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method class_method='true' selector='setMouseCoalescingEnabled:'>
       <arg index='0' type='B' />
     </method>
     <method selector='tilt'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
   </class>
   <class name='NSFileWrapper'>
       <retval type='B' />
     </method>
     <method selector='advancementForGlyph:'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='boundingRectForFont'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='boundingRectForGlyph:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method class_method='true' selector='fontWithName:matrix:'>
       <arg c_array_of_fixed_length='6' index='1' type_modifier='n' />
       <retval type='B' />
     </method>
     <method selector='maximumAdvancement'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='positionOfGlyph:forCharacter:struckOverRect:'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='positionOfGlyph:precededByGlyph:isNominal:'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
       <arg index='2' type='^B' type_modifier='o' />
     </method>
     <method selector='positionOfGlyph:struckOverGlyph:metricsExist:'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
       <arg index='2' type='^B' type_modifier='o' />
     </method>
     <method selector='positionOfGlyph:struckOverRect:metricsExist:'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='2' type='^B' type_modifier='o' />
     </method>
     <method selector='positionOfGlyph:withRelation:toBaseGlyph:totalAdvancement:metricsExist:'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
       <arg index='3' type_modifier='o' />
       <arg index='4' type='^B' type_modifier='o'/>
     </method>
       <arg index='0' type='B' />
     </method>
     <method selector='setFrameSize:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
   </class>
   <class name='NSFormCell'>
       <retval type='B' />
     </method>
     <method selector='titleWidth:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
   </class>
   <class name='NSGlyphGenerator'>
   </class>
   <class name='NSGradient'>
     <method selector='drawFromCenter:radius:toCenter:radius:options:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
       <arg index='1' type='f' type64='d' />
-      <arg index='2' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='2' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='drawFromPoint:toPoint:options:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='drawInBezierPath:relativeCenterPosition:'>
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='drawInRect:angle:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawInRect:relativeCenterPosition:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='getColor:location:atIndex:'>
       <arg index='0' type_modifier='o' />
       <retval type='B' />
     </method>
     <method selector='patternPhase'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='setPatternPhase:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='setShouldAntialias:'>
       <arg index='0' type='B' />
     </method>
     <method selector='showContextHelpForObject:locationHint:'>
       <retval type='B' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
   </class>
   <class name='NSImage'>
     <method selector='hitTestRect:withImageDestinationRect:context:hints:flipped:'>
       <retval type='B' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='4' type='B' />
     </method>
     <method selector='drawInRect:fromRect:operation:fraction:respectFlipped:hints:'>
       <retval type='B' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='4' type='B' />
     </method>
       <method selector='lockFocusFlipped:'>
 	      <arg index='0' type='B' />
       </method>
       <method selector='initWithCGImage:size:'>
-	      <arg index='1' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+	      <arg index='1' type='{_NSSize=ff}' type64='{CGSize=dd}' />
       </method>
       <method selector='CGImageForProposedRect:context:hints:'>
-	      <arg index='0' type_modifier='o' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+	      <arg index='0' type_modifier='o' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' />
       </method>
       <method selector='bestRepresentationForRect:context:hints:'>
-	      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+	      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       </method>
       <method selector='hitTestRect:withImageDestinationRect:context_hints:flipped:'>
 	      <retval type='B' />
-	      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-	      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+	      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+	      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       </method>
     <method selector='alignmentRect'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='cacheDepthMatchesImageDepth'>
       <retval type='B' />
       <retval type='B' />
     </method>
     <method selector='compositeToPoint:fromRect:operation:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='compositeToPoint:fromRect:operation:fraction:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='compositeToPoint:operation:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='compositeToPoint:operation:fraction:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='dissolveToPoint:fraction:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='dissolveToPoint:fromRect:fraction:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawAtPoint:fromRect:operation:fraction:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawInRect:fromRect:operation:fraction:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawRepresentation:inRect:'>
       <retval type='B' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='initWithIconRef:'>
       <arg index='0' type='^{OpaqueIconRef=}' />
     </method>
     <method selector='initWithSize:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='isCachedSeparately'>
       <retval type='B' />
       <retval type='B' />
     </method>
     <method selector='setAlignmentRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='setCacheDepthMatchesImageDepth:'>
       <arg index='0' type='B' />
       <arg index='0' type='B' />
     </method>
     <method selector='setSize:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setTemplate:'>
       <arg index='0' type='B' />
       <arg index='0' type='B' />
     </method>
     <method selector='size'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='usesEPSOnResolutionMismatch'>
       <retval type='B' />
     </method>
     <method selector='drawAtPoint:'>
       <retval type='B' />
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='drawInRect:'>
       <retval type='B' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawInRect:fromRect:operation:fraction:respectFlipped:hints:'>
       <retval type='B' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='4' type='B' />
     </method>
     <method selector='CGImageForProposedRect:context:hints:' >
-      <arg index='0' type_modifier='N' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type_modifier='N' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='hasAlpha'>
       <retval type='B' />
       <arg index='0' type='B' />
     </method>
     <method selector='setSize:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='size'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
   </class>
   <class name='NSImageView'>
   </class>
   <class name='NSLayoutManager'>
 	  <method selector='fillBackgroundRectArray:count:forCharacterRange:color:'>
-		  <arg index='0' type_modifier='N' c_array_length_in_arg='1' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+		  <arg index='0' type_modifier='N' c_array_length_in_arg='1' type='^{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' />
 	          <arg index='2' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
 	  </method>
 	  <method selector='characterIndexForPoint:inTextContainer:fractionOfDistanceBetweenInsertionPoints:'>
-             <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+             <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
 	     <arg index='2' type_modifier='o' />
 	  </method>
     <method selector='addTemporaryAttribute:value:forCharacterRange:'>
       <retval type='B' />
     </method>
     <method selector='attachmentSizeForGlyphAtIndex:'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='backgroundLayoutEnabled'>
       <retval type='B' />
     </method>
     <method selector='boundingRectForGlyphRange:inTextContainer:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='boundsRectForTextBlock:atIndex:effectiveRange:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='2' type_modifier='o' />
     </method>
     <method selector='boundsRectForTextBlock:glyphRange:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='1' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='characterRangeForGlyphRange:actualGlyphRange:'>
     </method>
     <method selector='drawBackgroundForGlyphRange:atPoint:'>
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='drawGlyphsForGlyphRange:atPoint:'>
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='drawStrikethroughForGlyphRange:strikethroughType:baselineOffset:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:'>
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='3' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='3' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='4' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='5' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='5' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='drawUnderlineForGlyphRange:underlineType:baselineOffset:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:'>
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='3' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='3' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='4' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='5' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='5' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='drawsOutsideLineFragmentForGlyphAtIndex:'>
       <retval type='B' />
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='ensureLayoutForBoundingRect:inTextContainer:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='ensureLayoutForCharacterRange:'>
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='extraLineFragmentRect'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='extraLineFragmentUsedRect'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='fractionOfDistanceThroughGlyphForPoint:inTextContainer:'>
       <retval type='f' type64='d' />
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='getFirstUnlaidCharacterIndex:glyphIndex:'>
       <arg index='0' type_modifier='o' />
       <arg index='1' type='^B' type_modifier='o' />
     </method>
     <method selector='glyphIndexForPoint:inTextContainer:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='glyphIndexForPoint:inTextContainer:fractionOfDistanceThroughGlyph:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
       <arg index='2' null_accepted='false' type_modifier='o' />
     </method>
     <method selector='glyphRangeForBoundingRect:inTextContainer:'>
       <retval type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='glyphRangeForBoundingRectWithoutAdditionalLayout:inTextContainer:'>
       <retval type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='glyphRangeForCharacterRange:actualCharacterRange:'>
       <retval type='{_NSRange=II}' type64='{_NSRange=QQ}' />
       <retval type='B' />
     </method>
     <method selector='layoutRectForTextBlock:atIndex:effectiveRange:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='2' type_modifier='o' />
     </method>
     <method selector='layoutRectForTextBlock:glyphRange:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='1' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='lineFragmentRectForGlyphAtIndex:effectiveRange:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='1' type_modifier='o' />
     </method>
     <method selector='lineFragmentRectForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='1' type_modifier='o' />
       <arg index='2' type='B' />
     </method>
     <method selector='lineFragmentUsedRectForGlyphAtIndex:effectiveRange:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='1' type_modifier='o' />
     </method>
     <method selector='lineFragmentUsedRectForGlyphAtIndex:effectiveRange:withoutAdditionalLayout:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='1' type_modifier='o' />
       <arg index='2' type='B' />
     </method>
     <method selector='locationForGlyphAtIndex:'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='notShownAttributeForGlyphAtIndex:'>
       <retval type='B' />
       <arg index='0' type='B' />
     </method>
     <method selector='setAttachmentSize:forGlyphRange:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
       <arg index='1' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='setBackgroundLayoutEnabled:'>
       <arg index='0' type='B' />
     </method>
     <method selector='setBoundsRect:forTextBlock:glyphRange:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='2' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='setDrawsOutsideLineFragment:forGlyphAtIndex:'>
       <arg index='0' type='B' />
     </method>
     <method selector='setExtraLineFragmentRect:usedRect:textContainer:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='setLayoutRect:forTextBlock:glyphRange:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='2' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='setLineFragmentRect:forGlyphRange:usedRect:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='1' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='setLocation:forStartOfGlyphRange:'>
-      <arg index='0' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='0' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
       <arg index='1' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
     </method>
     <method selector='setLocations:startingGlyphIndexes:count:forGlyphRange:'>
       <arg index='0' type='B' />
     </method>
     <method selector='showAttachmentCell:inRect:characterIndex:'>
-      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='1' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='showPackedGlyphs:length:glyphRange:atPoint:font:color:printingAdjustment:'>
       <arg c_array_length_in_arg='1' index='0' type='^v' type_modifier='n' />
       <arg index='2' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='3' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
-      <arg index='6' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='3' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
+      <arg index='6' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='showsControlCharacters'>
       <retval type='B' />
     </method>
     <method selector='strikethroughGlyphRange:strikethroughType:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:'>
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='3' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='4' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='4' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='temporaryAttribute:atCharacterIndex:effectiveRange:'>
       <arg index='2' type_modifier='o' />
     </method>
     <method selector='underlineGlyphRange:underlineType:lineFragmentRect:lineFragmentGlyphRange:containerOrigin:'>
       <arg index='0' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='2' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
       <arg index='3' type='{_NSRange=II}' type64='{_NSRange=QQ}' />
-      <arg index='4' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='4' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='usedRectForTextContainer:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='usesFontLeading'>
       <retval type='B' />
   </class>
   <class name='NSLevelIndicator'>
     <method selector='rectOfTickMarkAtIndex:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
   </class>
   <class name='NSLevelIndicatorCell'>
     <method selector='rectOfTickMarkAtIndex:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
   </class>
   <class name='NSMatrix'>
       <retval type='B' />
     </method>
     <method selector='cellFrameAtRow:column:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='cellSize'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='drawsBackground'>
       <retval type='B' />
       <retval type='B' />
       <arg index='0' type_modifier='o' />
       <arg index='1' type_modifier='o' />
-      <arg index='2' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <arg index='2' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method selector='getRow:column:ofCell:'>
       <retval type='B' />
       <arg index='0' type='B' />
     </method>
     <method selector='initWithFrame:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='initWithFrame:mode:cellClass:numberOfRows:numberOfColumns:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='initWithFrame:mode:prototype:numberOfRows:numberOfColumns:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='intercellSpacing'>
-      <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <retval type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='isAutoscroll'>
       <retval type='B' />
       <arg index='0' type='B' />
     </method>
     <method selector='setCellSize:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setDoubleAction:'>
       <arg index='0' sel_of_type='v@:@' />
       <arg index='0' type='B' />
     </method>
     <method selector='setIntercellSpacing:'>
-      <arg index='0' type='{_NSSize=ff}' type64='{_NSSize=dd}' />
+      <arg index='0' type='{_NSSize=ff}' type64='{CGSize=dd}' />
     </method>
     <method selector='setScrollable:'>
       <arg index='0' type='B' />
 	  <method selector='setAllowsContextMenuPlugIns:' >
 		  <arg index='0' type='B' />
 	  </method>
-	  <method selector='size' >
-    		  <retval type='{_NSSize=ff}' type64='{_NSSize=dd}' />
-	  </method>
 	  <method selector='setShowsStateColumn:' >
 		  <arg index='0' type='B' />
 	  </method>
 	  <method selector='popUpMenuPositioningItem:atLocation:inView:'>
 		  <retval type='B' />
-		  <arg index='1' type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+		  <arg index='1' type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
 	  </method>
     <method selector='addItemWithTitle:action:keyEquivalent:'>
       <arg index='1' sel_of_type='v@:@' />
       <retval type='B' />
     </method>
     <method selector='locationForSubmenu:'>
-      <retval type='{_NSPoint=ff}' type64='{_NSPoint=dd}' />
+      <retval type='{_NSPoint=ff}' type64='{CGPoint=dd}' />
     </method>
     <method class_method='true' selector='menuBarVisible'>
       <retval type='B' />
   </class>
   <class name='NSMenuItemCell'>
     <method selector='drawBorderAndBackgroundWithFrame:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawImageWithFrame:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawKeyEquivalentWithFrame:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawSeparatorItemWithFrame:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawStateImageWithFrame:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='drawTitleWithFrame:inView:'>
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>
     <method selector='keyEquivalentRectForBounds:'>
-      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
-      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{_NSRect={_NSPoint=dd}{_NSSize=dd}}' />
+      <retval type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
+      <arg index='0' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     </method>