From a6b2f23765d56a0f05be741004214b73842eaa92 Mon Sep 17 00:00:00 2001 From: Metallicow Date: Sat, 8 Feb 2020 21:34:05 -0600 Subject: [PATCH] Fix ListCtrl Demo to work on wxPy4.0 and 4.1 Don't break the demo on wxPy4.0 if hotswaping wxPy phoenix versions with wx.pth for example --- demo/ListCtrl.py | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/demo/ListCtrl.py b/demo/ListCtrl.py index dad208f77..a73a32d30 100644 --- a/demo/ListCtrl.py +++ b/demo/ListCtrl.py @@ -122,7 +122,8 @@ def __init__(self, parent, log): self.list.SetImageList(self.il, wx.IMAGE_LIST_SMALL) sizer.Add(self.list, 1, wx.EXPAND) - self.list.EnableCheckBoxes(enable=True) + if wx.VERSION >= (4, 1): + self.list.EnableCheckBoxes(enable=True) self.PopulateList() @@ -326,9 +327,10 @@ def OnRightClick(self, event): self.popupID4 = wx.NewIdRef() self.popupID5 = wx.NewIdRef() self.popupID6 = wx.NewIdRef() - self.popupID7 = wx.NewIdRef() - self.popupID8 = wx.NewIdRef() - self.popupID9 = wx.NewIdRef() + if wx.VERSION >= (4, 1): + self.popupID7 = wx.NewIdRef() + self.popupID8 = wx.NewIdRef() + self.popupID9 = wx.NewIdRef() self.Bind(wx.EVT_MENU, self.OnPopupOne, id=self.popupID1) self.Bind(wx.EVT_MENU, self.OnPopupTwo, id=self.popupID2) @@ -336,9 +338,10 @@ def OnRightClick(self, event): self.Bind(wx.EVT_MENU, self.OnPopupFour, id=self.popupID4) self.Bind(wx.EVT_MENU, self.OnPopupFive, id=self.popupID5) self.Bind(wx.EVT_MENU, self.OnPopupSix, id=self.popupID6) - self.Bind(wx.EVT_MENU, self.OnCheckAllBoxes, id=self.popupID7) - self.Bind(wx.EVT_MENU, self.OnUnCheckAllBoxes, id=self.popupID8) - self.Bind(wx.EVT_MENU, self.OnGetItemsChecked, id=self.popupID9) + if wx.VERSION >= (4, 1): + self.Bind(wx.EVT_MENU, self.OnCheckAllBoxes, id=self.popupID7) + self.Bind(wx.EVT_MENU, self.OnUnCheckAllBoxes, id=self.popupID8) + self.Bind(wx.EVT_MENU, self.OnGetItemsChecked, id=self.popupID9) # make a menu menu = wx.Menu() @@ -349,9 +352,10 @@ def OnRightClick(self, event): menu.Append(self.popupID4, "DeleteAllItems") menu.Append(self.popupID5, "GetItem") menu.Append(self.popupID6, "Edit") - menu.Append(self.popupID7, "Check All Boxes") - menu.Append(self.popupID8, "UnCheck All Boxes") - menu.Append(self.popupID9, "Get Checked Items") + if wx.VERSION >= (4, 1): + menu.Append(self.popupID7, "Check All Boxes") + menu.Append(self.popupID8, "UnCheck All Boxes") + menu.Append(self.popupID9, "Get Checked Items") # Popup the menu. If an item is selected then its handler # will be called before PopupMenu returns.