merged 2.2 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7748 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/tests/testi.py

@@ -0,0 +1,25 @@
+
+
+from wxPython.wx import *
+
+def t():
+    r1 = wxRect(0,0, 25, 500)
+    r2 = wxRect(10, 10, 50, 100)
+
+    r = wxIntersectRect(r1, r2)
+    print r
+
+    r = wxIntersectRect(r1, (50, 10, 50, 100))
+    print r
+
+
+
+
+
+class MyApp(wxApp):
+    def OnInit(self):
+        t()
+        return false
+
+app = MyApp(0)
+