Adjust the layout a bit, don't show the checkbox if we're not running

the demo framework.

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

diff --git a/wxPython/demo/ListCtrl.py b/wxPython/demo/ListCtrl.py
index 0fb6d95166847d3835dcb85d7566b7fbcc8f32ca..c766332fe9a7f00a408f5a936cc26f55b4f0915a 100644 (file)
--- a/wxPython/demo/ListCtrl.py
+++ b/wxPython/demo/ListCtrl.py
@@ -93,7 +93,8 @@ class TestListCtrlPanel(wx.Panel, listmix.ColumnSorterMixin):
         
         sizer = wx.BoxSizer(wx.VERTICAL)
         
-        if wx.Platform == "__WXMAC__":
+        if wx.Platform == "__WXMAC__" and \
+               hasattr(wx.GetApp().GetTopWindow(), "LoadDemo"):
             self.useNative = wx.CheckBox(self, -1, "Use native listctrl")
             self.useNative.SetValue( 
                 not wx.SystemOptions.GetOptionInt("mac.listctrl.always_use_generic") )
@@ -119,7 +120,7 @@ class TestListCtrlPanel(wx.Panel, listmix.ColumnSorterMixin):
                                  )
         
         self.list.SetImageList(self.il, wx.IMAGE_LIST_SMALL)
-        sizer.Add(self.list, 1, wx.EXPAND | wx.ALL, 4)
+        sizer.Add(self.list, 1, wx.EXPAND)
 
         self.PopulateList()
 

diff --git a/wxPython/demo/ListCtrl_edit.py b/wxPython/demo/ListCtrl_edit.py
index 4a8a65e3e32be2f3258ab897b587e0ee23793a78..e4dfe4fc06611da1566595e47ede27430cfde61c 100644 (file)
--- a/wxPython/demo/ListCtrl_edit.py
+++ b/wxPython/demo/ListCtrl_edit.py
@@ -89,7 +89,8 @@ class TestListCtrlPanel(wx.Panel):
 
         sizer = wx.BoxSizer(wx.VERTICAL)
         
-        if wx.Platform == "__WXMAC__":
+        if wx.Platform == "__WXMAC__" and \
+               hasattr(wx.GetApp().GetTopWindow(), "LoadDemo"):
             self.useNative = wx.CheckBox(self, -1, "Use native listctrl")
             self.useNative.SetValue( 
                 not wx.SystemOptions.GetOptionInt("mac.listctrl.always_use_generic") )
@@ -102,7 +103,7 @@ class TestListCtrlPanel(wx.Panel):
                                  | wx.LC_SORT_ASCENDING
                                  )
 
-        sizer.Add(self.list, 1, wx.EXPAND | wx.ALL, 4)
+        sizer.Add(self.list, 1, wx.EXPAND)
         self.SetSizer(sizer)
         self.SetAutoLayout(True)
 

diff --git a/wxPython/demo/ListCtrl_virtual.py b/wxPython/demo/ListCtrl_virtual.py
index 4c2e8c6a35a877ece98eb1ef98ad5e85c8de60d5..699ad1dc10b8fc78daaf234cb07d621e3227264a 100644 (file)
--- a/wxPython/demo/ListCtrl_virtual.py
+++ b/wxPython/demo/ListCtrl_virtual.py
@@ -90,7 +90,8 @@ class TestVirtualListPanel(wx.Panel):
         self.log = log
         sizer = wx.BoxSizer(wx.VERTICAL)
         
-        if wx.Platform == "__WXMAC__":
+        if wx.Platform == "__WXMAC__" and \
+               hasattr(wx.GetApp().GetTopWindow(), "LoadDemo"):
             self.useNative = wx.CheckBox(self, -1, "Use native listctrl")
             self.useNative.SetValue( 
                 not wx.SystemOptions.GetOptionInt("mac.listctrl.always_use_generic") )
@@ -98,7 +99,7 @@ class TestVirtualListPanel(wx.Panel):
             sizer.Add(self.useNative, 0, wx.ALL | wx.ALIGN_RIGHT, 4)
             
         self.list = TestVirtualList(self, self.log)
-        sizer.Add(self.list, 1, wx.EXPAND | wx.ALL, 4)
+        sizer.Add(self.list, 1, wx.EXPAND)
         
         self.SetSizer(sizer)
         self.SetAutoLayout(True)