merged 2.2 branch

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

wxPython/tests/grid.py

@@ -0,0 +1,24 @@
+from wxPython.wx import *
+from wxPython.lib.grids import wxFlexGridSizer
+
+class aFrame(wxFrame):
+    def __init__(self, parent=NULL, id=-1, title="test"):
+        wxFrame.__init__(self, parent, id, title)
+        s =wxBoxSizer(wxVERTICAL)
+        gs =wxFlexGridSizer(2, 2, 2, 2)
+        for label in ('one', 'two', 'tree', 'four'):
+            gs.Add(wxButton(self, -1, label, size=(100,100)), 1, wxEXPAND)
+        s.Add(gs, 1, wxEXPAND|wxALL, 50)
+        self.SetSizer(s)
+        self.SetAutoLayout(TRUE)
+        s.Fit(self)
+
+class MyApp(wxApp):
+    def OnInit(self):
+      frame =aFrame()
+      self.SetTopWindow(frame)
+      frame.Show(TRUE)
+      return TRUE
+
+app=MyApp(0)
+app.MainLoop()