[PyObjC-svn] r2336 - in trunk/pyobjc/pyobjc-framework-Cocoa: Lib/CoreFoundation Modules PyObjCTest

Author: ronaldoussoren
Date: Tue Oct 13 05:29:55 2009
New Revision: 2336

Log:
* Ensure that the inline table for CoreFoundation is actually loaded
* Fix more test issues on SL.


Modified:
   trunk/pyobjc/pyobjc-framework-Cocoa/Lib/CoreFoundation/PyObjC.bridgesupport
   trunk/pyobjc/pyobjc-framework-Cocoa/Lib/CoreFoundation/__init__.py
   trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_CoreFoundation_inlines.m
   trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfrunloop.py

Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Lib/CoreFoundation/PyObjC.bridgesupport
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Lib/CoreFoundation/PyObjC.bridgesupport	(original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Lib/CoreFoundation/PyObjC.bridgesupport	Tue Oct 13 05:29:55 2009
@@ -801,20 +801,20 @@
   <enum name='kCFXMLStatusParseInProgress' value='-1' />
   <enum name='kCFXMLStatusParseNotBegun' value='-2' />
   <enum name='kCFXMLStatusParseSuccessful' value='0' />
-  <function name='CFStringIsSurrogateHighCharacter' >
+  <function name='CFStringIsSurrogateHighCharacter' inline='true' >
     <retval type='B' />
     <arg type='T' />
   </function>
-  <function name='CFStringIsSurrogateLowCharacter' >
+  <function name='CFStringIsSurrogateLowCharacter' inline='true' >
     <retval type='B' />
     <arg type='T' />
   </function>
-  <function name='CFStringGetLongCharacterForSurrogatePair' >
+  <function name='CFStringGetLongCharacterForSurrogatePair' inline='true' >
     <retval type='I' />
     <arg type='T' />
     <arg type='T' />
   </function>
-  <function name='CFStringGetSurrogatePairForLongCharacter' >
+  <function name='CFStringGetSurrogatePairForLongCharacter' inline='true' >
     <retval type='B' />
     <arg type='I' />
     <arg type='^T' type_modifier='o' c_array_of_fixed_length='2' />

Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Lib/CoreFoundation/__init__.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Lib/CoreFoundation/__init__.py	(original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Lib/CoreFoundation/__init__.py	Tue Oct 13 05:29:55 2009
@@ -7,14 +7,16 @@
 
 import objc as _objc
 
-import  CoreFoundation._inlines
+from CoreFoundation._inlines import _inline_list_
+
 
 __bundle__ = _objc.initFrameworkWrapper("CoreFoundation",
     frameworkIdentifier="com.apple.CoreFoundation",
     frameworkPath=_objc.pathForFramework(
         "/System/Library/Frameworks/CoreFoundation.framework"),
     globals=globals(),
-    scan_classes=False)
+    scan_classes=False,
+    inlineTab=_inline_list_)
 
 #from CoreFoundation._CFArray import *
 from CoreFoundation._CFBag import *

Modified: trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_CoreFoundation_inlines.m
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_CoreFoundation_inlines.m	(original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/Modules/_CoreFoundation_inlines.m	Tue Oct 13 05:29:55 2009
@@ -39,6 +39,12 @@
 	{"CFUserNotificationCheckBoxChecked", (FUNCTION)&CFUserNotificationCheckBoxChecked },
 	{"CFUserNotificationPopUpSelection", (FUNCTION)&CFUserNotificationPopUpSelection },
 	{"CFUserNotificationSecureTextField", (FUNCTION)&CFUserNotificationSecureTextField },
+#if  PyObjC_BUILD_RELEASE >= 1006
+	{"CFStringIsSurrogateHighCharacter", (FUNCTION)&CFStringIsSurrogateHighCharacter },
+	{"CFStringIsSurrogateLowCharacter", (FUNCTION)&CFStringIsSurrogateLowCharacter },
+	{"CFStringGetLongCharacterForSurrogatePair", (FUNCTION)&CFStringGetLongCharacterForSurrogatePair },
+	{"CFStringGetSurrogatePairForLongCharacter", (FUNCTION)&CFStringGetSurrogatePairForLongCharacter },
+#endif
     { 0, 0 }
 };
 

Modified: trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfrunloop.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfrunloop.py	(original)
+++ trunk/pyobjc/pyobjc-framework-Cocoa/PyObjCTest/test_cfrunloop.py	Tue Oct 13 05:29:55 2009
@@ -1,5 +1,6 @@
 from PyObjCTools.TestSupport import *
 from CoreFoundation import *
+import CoreFoundation
 
 
 class TestRunLoop (TestCase):

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference