fixed child windows scrolling to use wxSIZE_ALLOW_MINUS_ONE

[wxWidgets.git] / wxPython / demo / GridBagSizer.py

diff --git a/wxPython/demo/GridBagSizer.py b/wxPython/demo/GridBagSizer.py
index a0ee009bce2d44ec9848073cbf4f9bb7f19e71df..25ef8cdb00503d07e8751de5ba6b9fcbe9afbe65 100644 (file)
--- a/wxPython/demo/GridBagSizer.py
+++ b/wxPython/demo/GridBagSizer.py
@@ -12,7 +12,10 @@ static text is positioned at (0,0) and it spans 7 columns.
 class TestFrame(wx.Frame):
     def __init__(self):
         wx.Frame.__init__(self, None, -1, "wx.GridBagSizer")
 class TestFrame(wx.Frame):
     def __init__(self):
         wx.Frame.__init__(self, None, -1, "wx.GridBagSizer")

-        p = wx.Panel(self, -1)
+        p = wx.Panel(self, -1, style = wx.TAB_TRAVERSAL
+                     | wx.CLIP_CHILDREN
+                     | wx.FULL_REPAINT_ON_RESIZE
+                     )

         p.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
         
         gbs = self.gbs = wx.GridBagSizer(5, 5)
         p.Bind(wx.EVT_LEFT_DOWN, self.OnLeftDown)
         
         gbs = self.gbs = wx.GridBagSizer(5, 5)


@@ -91,11 +94,11 @@ class TestFrame(wx.Frame):
             self.gbs.SetItemPosition(btn, self.lastPos)
             btn.SetLabel("Move this to (3,6)")
         else:
             self.gbs.SetItemPosition(btn, self.lastPos)
             btn.SetLabel("Move this to (3,6)")
         else:

-            if self.gbs.CheckForIntersection( (3,6), (1,1) ):
+            if self.gbs.CheckForIntersectionPos( (3,6), (1,1) ):

                 wx.MessageBox("""\
 wx.GridBagSizer will not allow items to be in the same cell as
                 wx.MessageBox("""\
 wx.GridBagSizer will not allow items to be in the same cell as

-another item, so this operation will fail.  You will also get an assert
-when compiled in debug mode.""",
+another item, so this operation will fail.  You will also get an
+assert when compiled in debug mode.""",

                               "Warning", wx.OK | wx.ICON_INFORMATION)
 
             try:
                               "Warning", wx.OK | wx.ICON_INFORMATION)
 
             try:


@@ -117,12 +120,29 @@ when compiled in debug mode.""",
             print "item found: ", `item.GetPos()`, "--", `item.GetSpan()`
 
         
             print "item found: ", `item.GetPos()`, "--", `item.GetSpan()`
 
         

-#----------------------------------------------------------------------
+#---------------------------------------------------------------------------
+
+class TestPanel(wx.Panel):
+    def __init__(self, parent, log):
+        self.log = log
+        wx.Panel.__init__(self, parent, -1)
+
+        b = wx.Button(self, -1, "Show the GridBagSizer sample", (50,50))
+        self.Bind(wx.EVT_BUTTON, self.OnButton, b)
+
+
+    def OnButton(self, evt):
+        win = TestFrame()
+        win.Show(True)
+
+
+
+#---------------------------------------------------------------------------
+

 
 def runTest(frame, nb, log):
 
 def runTest(frame, nb, log):

-    win = TestFrame()
-    frame.otherWin = win
-    win.Show(True)
+    win = TestPanel(nb, log)
+    return win

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -144,5 +164,5 @@ span across more than one row or column.
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])