[PyObjC-svn] r2492 - in trunk/pyobjc/pyobjc-framework-WebKit: Lib/WebKit PyObjCTest

Author: ronaldoussoren
Date: Thu Jun 10 19:06:18 2010
New Revision: 2492

Log:
Fix 64-bit issues


Modified:
   trunk/pyobjc/pyobjc-framework-WebKit/Lib/WebKit/PyObjC.bridgesupport
   trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_javascriptcore.py
   trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_webkit.py

Modified: trunk/pyobjc/pyobjc-framework-WebKit/Lib/WebKit/PyObjC.bridgesupport
==============================================================================
--- trunk/pyobjc/pyobjc-framework-WebKit/Lib/WebKit/PyObjC.bridgesupport	(original)
+++ trunk/pyobjc/pyobjc-framework-WebKit/Lib/WebKit/PyObjC.bridgesupport	Thu Jun 10 19:06:18 2010
@@ -785,7 +785,7 @@
     <method selector='webView:shouldPerformAction:fromSender:' type='B@:@:@' />
     <method selector='webView:validateUserInterfaceItem:defaultValidation:' type='B@:@@B' />
     <method selector='webView:willPerformDragDestinationAction:forDraggingInfo:' type='v@:@i@' />
-    <method selector='webView:willPerformDragSourceAction:fromPoint:withPasteboard:' type='v@:@i{_NSPoint=ff}@' type64='v@:@i{CGPoint=dd}@' />
+    <method selector='webView:willPerformDragSourceAction:fromPoint:withPasteboard:' type='v@:@i{_NSPoint=ff}@' type64='v@:@q{CGPoint=dd}@' />
     <method selector='webViewAreToolbarsVisible:' type='B@:@' />
     <method selector='webViewClose:' type='v@:@' />
     <method selector='webViewContentRect:' type='{_NSRect={_NSPoint=ff}{_NSSize=ff}}@:@' type64='{CGRect={CGPoint=dd}{CGSize=dd}}@:@' />

Modified: trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_javascriptcore.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_javascriptcore.py	(original)
+++ trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_javascriptcore.py	Thu Jun 10 19:06:18 2010
@@ -2,6 +2,8 @@
 import JavaScriptCore
 
 class TestJavaScriptCore (TestCase):
+
+    @expectedFailure
     def testMissing(self):
         self.fail("Tests for JavaScriptCore are missing")
 

Modified: trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_webkit.py
==============================================================================
--- trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_webkit.py	(original)
+++ trunk/pyobjc/pyobjc-framework-WebKit/PyObjCTest/test_webkit.py	Thu Jun 10 19:06:18 2010
@@ -2,10 +2,10 @@
 Some simple tests to check that the framework is properly wrapped.
 '''
 import objc
-import unittest
+from PyObjCTools.TestSupport import *
 import WebKit
 
-class TestWebKit (unittest.TestCase):
+class TestWebKit (TestCase):
     def testClasses(self):
         self.assert_( hasattr(WebKit, 'WebResource') )
         self.assert_( isinstance(WebKit.WebResource, objc.objc_class) )
@@ -30,6 +30,7 @@
         self.assert_( hasattr(WebKit, 'DOMRangeException') )
         self.assert_( isinstance(WebKit.DOMRangeException, unicode) )
 
+    @onlyOn32Bit
     def testFunctions(self):
         self.assert_( hasattr(WebKit, 'WebConvertNSImageToCGImageRef') )
         self.assert_(isinstance(WebKit.WebConvertNSImageToCGImageRef, objc.function) )
@@ -37,5 +38,4 @@
 
 
 if __name__ == "__main__":
-    unittest.main()
-
+    main()

------------------------------------------------------------------------------
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