Use the generic listctrl on Mac by default until it gets up to par

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

diff --git a/wxPython/demo/ListCtrl.py b/wxPython/demo/ListCtrl.py
index 7ef63aaf29670b1c723ede8b7232df6e114269e5..4f3ad75586ae1168fba22eaddcbbd4429cb98a18 100644 (file)
--- a/wxPython/demo/ListCtrl.py
+++ b/wxPython/demo/ListCtrl.py
@@ -205,7 +205,7 @@ class TestListCtrlPanel(wx.Panel, listmix.ColumnSorterMixin):
         self.log.WriteText("x, y = %s\n" % str((x, y)))
         item, flags = self.list.HitTest((x, y))
 
-        if flags & wx.LIST_HITTEST_ONITEM:
+        if item != wx.NOT_FOUND and flags & wx.LIST_HITTEST_ONITEM:
             self.list.Select(item)
 
         event.Skip()
@@ -354,6 +354,9 @@ class TestListCtrlPanel(wx.Panel, listmix.ColumnSorterMixin):
 
 #---------------------------------------------------------------------------
 
+# for testing the new native control on wxMac
+#wx.SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 0)
+
 def runTest(frame, nb, log):
     win = TestListCtrlPanel(nb, log)
     return win

diff --git a/wxPython/src/_listctrl.i b/wxPython/src/_listctrl.i
index c052337dd62f4ed73deebeac0194c9664a373968..d53789b681e6d4192c9492c260c17d0fa5a8f361 100644 (file)
--- a/wxPython/src/_listctrl.i
+++ b/wxPython/src/_listctrl.i
@@ -446,7 +446,9 @@ IMP_PYCALLBACK_INT_LONGLONG(wxPyListCtrl, wxListCtrl, OnGetItemColumnImage);
 
 
 
-
+// NOTE: The following option is set in _settings.i
+//     # Until the new native control for wxMac is up to par, still use the generic one.
+//     SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1)
 
 MustHaveApp(wxPyListCtrl);
 

diff --git a/wxPython/src/_settings.i b/wxPython/src/_settings.i
index 3f4a0c88bc115e80ff337d5f37ce29e34b8c699c..f45d1fe3b9b0babdc9ceb76d3778dd250debe81b 100644 (file)
--- a/wxPython/src/_settings.i
+++ b/wxPython/src/_settings.i
@@ -205,4 +205,10 @@ public:
 
 
 
+%pythoncode {
+    %# Until the new native control for wxMac is up to par, still use the generic one.
+    SystemOptions.SetOptionInt("mac.listctrl.always_use_generic", 1)
+}
+
+
 //---------------------------------------------------------------------------