X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15513a8066caaed1d1265cc06c47fc5c8ec1127e..b4eecebd423df0c6efe86d7658cd3df818d67ed8:/wxPython/demo/ListCtrl_edit.py?ds=sidebyside

diff --git a/wxPython/demo/ListCtrl_edit.py b/wxPython/demo/ListCtrl_edit.py
index cba1e24007..e4dfe4fc06 100644
--- a/wxPython/demo/ListCtrl_edit.py
+++ b/wxPython/demo/ListCtrl_edit.py
@@ -34,8 +34,7 @@ class TestListCtrl(wx.ListCtrl,
                  size=wx.DefaultSize, style=0):
         wx.ListCtrl.__init__(self, parent, ID, pos, size, style)
 
-        # Divide remaining space over all columns
-        listmix.ListCtrlAutoWidthMixin.__init__(self, 0, 3)
+        listmix.ListCtrlAutoWidthMixin.__init__(self)
         self.Populate()
         listmix.TextEditMixin.__init__(self)
 
@@ -88,18 +87,30 @@ class TestListCtrlPanel(wx.Panel):
         self.log = log
         tID = wx.NewId()
 
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        
+        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") )
+            self.Bind(wx.EVT_CHECKBOX, self.OnUseNative, self.useNative)
+            sizer.Add(self.useNative, 0, wx.ALL | wx.ALIGN_RIGHT, 4)
+
         self.list = TestListCtrl(self, tID,
                                  style=wx.LC_REPORT
                                  | wx.BORDER_NONE
                                  | wx.LC_SORT_ASCENDING
                                  )
 
-        self.Bind(wx.EVT_SIZE, self.OnSize)
+        sizer.Add(self.list, 1, wx.EXPAND)
+        self.SetSizer(sizer)
+        self.SetAutoLayout(True)
 
 
-    def OnSize(self, event):
-        w,h = self.GetClientSizeTuple()
-        self.list.SetDimensions(0, 0, w, h)
+    def OnUseNative(self, event):
+        wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", not event.IsChecked())
+        wx.GetApp().GetTopWindow().LoadDemo("ListCtrl_edit")