[PyObjC-svn] r2490 - in trunk/pyobjc/pyobjc-framework-CoreText: . Lib/CoreText PyObjCTest

Author: ronaldoussoren
Date: Thu Jun 10 18:37:40 2010
New Revision: 2490

Log:
Fix a number of 64-bit issues.

Still todo: ensure that NSPoint and CGPoint refer to the same
type throughout pyobjc (and likewise for NSSize, NSRect, ...)


Modified:
   trunk/pyobjc/pyobjc-framework-CoreText/   (props changed)
   trunk/pyobjc/pyobjc-framework-CoreText/Lib/CoreText/PyObjC.bridgesupport
   trunk/pyobjc/pyobjc-framework-CoreText/PyObjCTest/test_ctframe.py
   trunk/pyobjc/pyobjc-framework-CoreText/PyObjCTest/test_ctglyphinfo.py
   trunk/pyobjc/pyobjc-framework-CoreText/distribute_setup.py

Modified: trunk/pyobjc/pyobjc-framework-CoreText/Lib/CoreText/PyObjC.bridgesupport
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreText/Lib/CoreText/PyObjC.bridgesupport	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreText/Lib/CoreText/PyObjC.bridgesupport	Thu Jun 10 18:37:40 2010
@@ -403,7 +403,7 @@
     <retval already_cfretained='true' type='^{__CTFont=}' />
     <arg type='^{__CTFont=}' />
     <arg type='^{__CFString=}' />
-    <arg type='{_CFRange=ii}' type64='{_CFRange=ii}' />
+    <arg type='{_CFRange=ii}' type64='{_CFRange=ll}' />
   </function>
   <function name='CTFontCreatePathForGlyph'>
     <retval type='^{CGPath=}' />
@@ -539,7 +539,7 @@
     <arg type='^{__CTFont=}' />
     <arg type='I' />
     <arg type='^S' type_modifier='n' c_array_length_in_arg='4' />
-    <arg type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=ff}{CGSize=ff}}' type_modifier='o' c_array_length_in_arg='4' />
+    <arg type='^{CGRect={CGPoint=ff}{CGSize=ff}}' type64='^{CGRect={CGPoint=dd}{CGSize=dd}}' type_modifier='o' c_array_length_in_arg='4' />
     <arg type='l' type64='l' />
   </function>
   <function name='CTFontGetCapHeight'>
@@ -630,8 +630,8 @@
   </function>
   <function name='CTFrameGetLineOrigins'>
     <arg type='^{__CTFrame=}' />
-    <arg type='{_CFRange=ii}' type64='{_CFRange=ii}' />
-    <arg c_array_length_in_arg='1' type='^{CGPoint=ff}' type64='^{CGPoint=ff}' type_modifier='o' />
+    <arg type='{_CFRange=ii}' type64='{_CFRange=ll}' />
+    <arg c_array_length_in_arg='1' type='^{CGPoint=ff}' type64='^{CGPoint=dd}' type_modifier='o' />
   </function>
   <function name='CTFrameGetLines'>
     <retval type='^{__CFArray=}' />
@@ -642,20 +642,20 @@
     <arg type='^{__CTFrame=}' />
   </function>
   <function name='CTFrameGetStringRange'>
-    <retval type='{_CFRange=ii}' type64='{_CFRange=qq}' />
+    <retval type='{_CFRange=ii}' type64='{_CFRange=ll}' />
     <arg type='^{__CTFrame=}' />
   </function>
   <function name='CTFrameGetTypeID'>
     <retval type='L' type64='Q' />
   </function>
   <function name='CTFrameGetVisibleStringRange'>
-    <retval type='{_CFRange=ii}' type64='{_CFRange=qq}' />
+    <retval type='{_CFRange=ii}' type64='{_CFRange=ll}' />
     <arg type='^{__CTFrame=}' />
   </function>
   <function name='CTFramesetterCreateFrame'>
     <retval already_cfretained='true' type='^{__CTFrame=}' />
     <arg type='^{__CTFramesetter=}' />
-    <arg type='{_CFRange=ii}' type64='{_CFRange=ii}' />
+    <arg type='{_CFRange=ii}' type64='{_CFRange=ll}' />
     <arg type='^{CGPath=}' type64='^{CGPath=}' />
     <arg type='^{__CFDictionary=}' />
   </function>
@@ -755,10 +755,10 @@
   <function name='CTLineGetStringIndexForPosition'>
     <retval type='l' type64='q' />
     <arg type='^{__CTLine=}' />
-    <arg type='{CGPoint=ff}' type64='{CGPoint=ff}' />
+    <arg type='{CGPoint=ff}' type64='{CGPoint=dd}' />
   </function>
   <function name='CTLineGetStringRange'>
-    <retval type='{_CFRange=ii}' type64='{_CFRange=qq}' />
+    <retval type='{_CFRange=ii}' type64='{_CFRange=ll}' />
     <arg type='^{__CTLine=}' />
   </function>
   <function name='CTLineGetTrailingWhitespaceWidth'>
@@ -797,7 +797,7 @@
   <function name='CTRunDraw'>
     <arg type='^{__CTRun=}' />
     <arg type='^{CGContext=}' type64='^{CGContext=}' />
-    <arg type='{_CFRange=ii}' type64='{_CFRange=ii}' />
+    <arg type='{_CFRange=ii}' type64='{_CFRange=ll}' />
   </function>
   <function name='CTRunGetAttributes'>
     <retval type='^{__CFDictionary=}' />
@@ -809,7 +809,7 @@
   </function>
   <function name='CTRunGetGlyphs'>
     <arg type='^{__CTRun=}' />
-    <arg type='{_CFRange=ii}' type64='{_CFRange=ii}' />
+    <arg type='{_CFRange=ii}' type64='{_CFRange=ll}' />
     <arg c_array_length_in_arg='1' type='^S' type_modifier='o' />
   </function>
   <function name='CTRunGetGlyphsPtr'>
@@ -820,11 +820,11 @@
     <retval type='{CGRect={CGPoint=ff}{CGSize=ff}}' type64='{CGRect={CGPoint=dd}{CGSize=dd}}' />
     <arg type='^{__CTRun=}' />
     <arg type='^{CGContext=}' type64='^{CGContext=}' />
-    <arg type='{_CFRange=ii}' type64='{_CFRange=ii}' />
+    <arg type='{_CFRange=ii}' type64='{_CFRange=ll}' />
   </function>
   <function name='CTRunGetPositions'>
     <arg type='^{__CTRun=}' />
-    <arg type='{_CFRange=ii}' type64='{_CFRange=ii}' />
+    <arg type='{_CFRange=ii}' type64='{_CFRange=ll}' />
     <arg type='^{CGPoint=ff}' type64='^{CGPoint=dd}' type_modifier='o' c_array_length_in_arg='1'  />
   </function>
   <function name='CTRunGetPositionsPtr'>
@@ -837,7 +837,7 @@
   </function>
   <function name='CTRunGetStringIndices'>
     <arg type='^{__CTRun=}' />
-    <arg type='{_CFRange=ii}' type64='{_CFRange=ii}' />
+    <arg type='{_CFRange=ii}' type64='{_CFRange=ll}' />
     <arg c_array_length_in_arg='1' type='^i' type64='^i' type_modifier='o' />
   </function>
   <function name='CTRunGetStringIndicesPtr'>
@@ -845,7 +845,7 @@
     <arg type='^{__CTRun=}' />
   </function>
   <function name='CTRunGetStringRange'>
-    <retval type='{_CFRange=ii}' type64='{_CFRange=qq}' />
+    <retval type='{_CFRange=ii}' type64='{_CFRange=ll}' />
     <arg type='^{__CTRun=}' />
   </function>
   <function name='CTRunGetTextMatrix'>
@@ -858,7 +858,7 @@
   <function name='CTRunGetTypographicBounds'>
     <retval type='d' />
     <arg type='^{__CTRun=}' />
-    <arg type='{_CFRange=ii}' type64='{_CFRange=ii}' />
+    <arg type='{_CFRange=ii}' type64='{_CFRange=ll}' />
     <arg type='^f' type64='^f' type_modifier='o' />
     <arg type='^f' type64='^f' type_modifier='o' />
     <arg type='^f' type64='^f' type_modifier='o' />
@@ -887,7 +887,7 @@
   <function name='CTTypesetterCreateLine'>
     <retval already_cfretained='true' type='^{__CTLine=}' />
     <arg type='^{__CTTypesetter=}' />
-    <arg type='{_CFRange=ii}' type64='{_CFRange=ii}' />
+    <arg type='{_CFRange=ii}' type64='{_CFRange=ll}' />
   </function>
   <function name='CTTypesetterCreateWithAttributedString'>
     <retval already_cfretained='true' type='^{__CTTypesetter=}' />

Modified: trunk/pyobjc/pyobjc-framework-CoreText/PyObjCTest/test_ctframe.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreText/PyObjCTest/test_ctframe.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreText/PyObjCTest/test_ctframe.py	Thu Jun 10 18:37:40 2010
@@ -38,7 +38,7 @@
         v = CTFrameGetVisibleStringRange(frame)
         self.assertIsInstance(v, CFRange)
 
-        self.failIfResultIsCFRetained(CTFrameGetPath)
+        self.assertResultIsNotCFRetained(CTFrameGetPath)
         v = CTFrameGetPath(frame)
         self.assertIsInstance(v, CGPathRef)
 

Modified: trunk/pyobjc/pyobjc-framework-CoreText/PyObjCTest/test_ctglyphinfo.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreText/PyObjCTest/test_ctglyphinfo.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreText/PyObjCTest/test_ctglyphinfo.py	Thu Jun 10 18:37:40 2010
@@ -43,7 +43,7 @@
         v = CTGlyphInfoGetCharacterIdentifier(info)
         self.assertIsInstance(v, (int, long))
 
-        self.failIfResultIsCFRetained(CTGlyphInfoGetCharacterCollection)
+        self.assertResultIsNotCFRetained(CTGlyphInfoGetCharacterCollection)
         v = CTGlyphInfoGetCharacterCollection(info)
         self.assertIsInstance(v, (int, long))
 

Modified: trunk/pyobjc/pyobjc-framework-CoreText/distribute_setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-CoreText/distribute_setup.py	(original)
+++ trunk/pyobjc/pyobjc-framework-CoreText/distribute_setup.py	Thu Jun 10 18:37:40 2010
@@ -46,7 +46,7 @@
             args = [quote(arg) for arg in args]
         return os.spawnl(os.P_WAIT, sys.executable, *args) == 0
 
-DEFAULT_VERSION = "0.6.8"
+DEFAULT_VERSION = "0.6.4"
 DEFAULT_URL = "http://pypi.python.org/packages/source/d/distribute/"
 SETUPTOOLS_PKG_INFO = """\
 Metadata-Version: 1.0

------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo