demo tweaks

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

diff --git a/wxPython/demo/CollapsiblePane.py b/wxPython/demo/CollapsiblePane.py
index 4e0b993a3a9401840478c230fdd17fd3d380cd12..15ab9ad54a2f2eb0ac8c7b6794392cd0dd8e9a69 100644 (file)
--- a/wxPython/demo/CollapsiblePane.py
+++ b/wxPython/demo/CollapsiblePane.py
@@ -39,8 +39,13 @@ class TestPanel(wx.Panel):
         
 
     def OnPaneChanged(self, evt=None):
         
 
     def OnPaneChanged(self, evt=None):

-        self.log.write('wx.EVT_COLLAPSIBLEPANE_CHANGED')
+        if evt:
+            self.log.write('wx.EVT_COLLAPSIBLEPANE_CHANGED: %s' % evt.Collapsed)
+
+        # redo the layout

         self.Layout()
         self.Layout()

+
+        # and also change the labels

         if self.cp.IsExpanded():
             self.cp.SetLabel(label2)
             self.btn.SetLabel(btnlbl2)
         if self.cp.IsExpanded():
             self.cp.SetLabel(label2)
             self.btn.SetLabel(btnlbl2)


@@ -65,8 +70,6 @@ class TestPanel(wx.Panel):
         zip   = wx.TextCtrl(pane, -1, "", size=(70,-1));
         
         addrSizer = wx.FlexGridSizer(cols=2, hgap=5, vgap=5)
         zip   = wx.TextCtrl(pane, -1, "", size=(70,-1));
         
         addrSizer = wx.FlexGridSizer(cols=2, hgap=5, vgap=5)

-        addrSizer.Add((10,10))
-        addrSizer.Add((10,10))

         addrSizer.AddGrowableCol(1)
         addrSizer.Add(nameLbl, 0, 
                 wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
         addrSizer.AddGrowableCol(1)
         addrSizer.Add(nameLbl, 0, 
                 wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)


@@ -74,7 +77,7 @@ class TestPanel(wx.Panel):
         addrSizer.Add(addrLbl, 0,
                 wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
         addrSizer.Add(addr1, 0, wx.EXPAND)
         addrSizer.Add(addrLbl, 0,
                 wx.ALIGN_RIGHT|wx.ALIGN_CENTER_VERTICAL)
         addrSizer.Add(addr1, 0, wx.EXPAND)

-        addrSizer.Add((10,10)) 
+        addrSizer.Add((5,5)) 

         addrSizer.Add(addr2, 0, wx.EXPAND)
 
         addrSizer.Add(cstLbl, 0,
         addrSizer.Add(addr2, 0, wx.EXPAND)
 
         addrSizer.Add(cstLbl, 0,


@@ -86,7 +89,9 @@ class TestPanel(wx.Panel):
         cstSizer.Add(zip)
         addrSizer.Add(cstSizer, 0, wx.EXPAND)
 
         cstSizer.Add(zip)
         addrSizer.Add(cstSizer, 0, wx.EXPAND)
 

-        pane.SetSizer(addrSizer)
+        border = wx.BoxSizer()
+        border.Add(addrSizer, 1, wx.EXPAND|wx.ALL, 5)
+        pane.SetSizer(border)