diff -r 748017ca4151 -r 10aa87518401 IDEFrame.py --- a/IDEFrame.py Thu Jun 07 14:45:03 2018 +0300 +++ b/IDEFrame.py Thu Jun 07 16:31:26 2018 +0300 @@ -211,13 +211,7 @@ def AppendMenu(parent, help, id, kind, text): - """ - Compatibility function for wx versions < 2.6 - """ - if wx.VERSION >= (2, 6, 0): - parent.Append(help=help, id=id, kind=kind, text=text) - else: - parent.Append(helpString=help, id=id, kind=kind, item=text) + parent.Append(help=help, id=id, kind=kind, text=text) [ @@ -341,13 +335,6 @@ class IDEFrame(wx.Frame): """IDEFrame Base Class""" - # Compatibility function for wx versions < 2.6 - if wx.VERSION < (2, 6, 0): - def Bind(self, event, function, id=None): - if id is not None: - event(self, id, function) - else: - event(self, function) def _init_coll_MenuBar_Menus(self, parent): parent.Append(menu=self.FileMenu, title=_(u'&File')) @@ -2129,10 +2116,7 @@ EditorToolBar = self.Panes["EditorToolBar"] for item in self.CurrentEditorToolBar: - if wx.VERSION >= (2, 6, 0): - self.Unbind(wx.EVT_MENU, id=item) - else: - self.Disconnect(id=item, eventType=wx.wxEVT_COMMAND_MENU_SELECTED) + self.Unbind(wx.EVT_MENU, id=item) if EditorToolBar: EditorToolBar.DeleteTool(item)