diff --git a/wx/lib/docview.py b/wx/lib/docview.py index 1b4547a7..abe86ba6 100644 --- a/wx/lib/docview.py +++ b/wx/lib/docview.py @@ -1316,31 +1316,31 @@ class DocManager(wx.EvtHandler): if initialize: self.Initialize() - wx.EVT_MENU(self, wx.ID_OPEN, self.OnFileOpen) - wx.EVT_MENU(self, wx.ID_CLOSE, self.OnFileClose) - wx.EVT_MENU(self, wx.ID_CLOSE_ALL, self.OnFileCloseAll) - wx.EVT_MENU(self, wx.ID_REVERT, self.OnFileRevert) - wx.EVT_MENU(self, wx.ID_NEW, self.OnFileNew) - wx.EVT_MENU(self, wx.ID_SAVE, self.OnFileSave) - wx.EVT_MENU(self, wx.ID_SAVEAS, self.OnFileSaveAs) - wx.EVT_MENU(self, wx.ID_UNDO, self.OnUndo) - wx.EVT_MENU(self, wx.ID_REDO, self.OnRedo) - wx.EVT_MENU(self, wx.ID_PRINT, self.OnPrint) - wx.EVT_MENU(self, wx.ID_PRINT_SETUP, self.OnPrintSetup) - wx.EVT_MENU(self, wx.ID_PREVIEW, self.OnPreview) + self.Bind(wx.EVT_MENU, self.OnFileOpen, id=wx.ID_OPEN) + self.Bind(wx.EVT_MENU, self.OnFileClose, id=wx.ID_CLOSE) + self.Bind(wx.EVT_MENU, self.OnFileCloseAll, id=wx.ID_CLOSE_ALL) + self.Bind(wx.EVT_MENU, self.OnFileRevert, id=wx.ID_REVERT) + self.Bind(wx.EVT_MENU, self.OnFileNew, id=wx.ID_NEW) + self.Bind(wx.EVT_MENU, self.OnFileSave, id=wx.ID_SAVE) + self.Bind(wx.EVT_MENU, self.OnFileSaveAs, id=wx.ID_SAVEAS) + self.Bind(wx.EVT_MENU, self.OnUndo, id=wx.ID_UNDO) + self.Bind(wx.EVT_MENU, self.OnRedo, id=wx.ID_REDO) + self.Bind(wx.EVT_MENU, self.OnPrint, id=wx.ID_PRINT) + self.Bind(wx.EVT_MENU, self.OnPrintSetup, id=wx.ID_PRINT_SETUP) + self.Bind(wx.EVT_MENU, self.OnPreview, id=wx.ID_PREVIEW) - wx.EVT_UPDATE_UI(self, wx.ID_OPEN, self.OnUpdateFileOpen) - wx.EVT_UPDATE_UI(self, wx.ID_CLOSE, self.OnUpdateFileClose) - wx.EVT_UPDATE_UI(self, wx.ID_CLOSE_ALL, self.OnUpdateFileCloseAll) - wx.EVT_UPDATE_UI(self, wx.ID_REVERT, self.OnUpdateFileRevert) - wx.EVT_UPDATE_UI(self, wx.ID_NEW, self.OnUpdateFileNew) - wx.EVT_UPDATE_UI(self, wx.ID_SAVE, self.OnUpdateFileSave) - wx.EVT_UPDATE_UI(self, wx.ID_SAVEAS, self.OnUpdateFileSaveAs) - wx.EVT_UPDATE_UI(self, wx.ID_UNDO, self.OnUpdateUndo) - wx.EVT_UPDATE_UI(self, wx.ID_REDO, self.OnUpdateRedo) - wx.EVT_UPDATE_UI(self, wx.ID_PRINT, self.OnUpdatePrint) - wx.EVT_UPDATE_UI(self, wx.ID_PRINT_SETUP, self.OnUpdatePrintSetup) - wx.EVT_UPDATE_UI(self, wx.ID_PREVIEW, self.OnUpdatePreview) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateFileOpen, id=wx.ID_OPEN) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateFileClose, id=wx.ID_CLOSE) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateFileCloseAll, id=wx.ID_CLOSE_ALL) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateFileRevert, id=wx.ID_REVERT) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateFileNew, id=wx.ID_NEW) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateFileSave, id=wx.ID_SAVE) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateFileSaveAs, id=wx.ID_SAVEAS) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUndo, id=wx.ID_UNDO) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdateRedo, id=wx.ID_REDO) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdatePrint, id=wx.ID_PRINT) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdatePrintSetup, id=wx.ID_PRINT_SETUP) + self.Bind(wx.EVT_UPDATE_UI, self.OnUpdatePreview, id=wx.ID_PREVIEW) def Destroy(self): @@ -2366,36 +2366,36 @@ class DocParentFrame(wx.Frame): wx.Frame.__init__(self, frame, id, title, pos, size, style) self._docManager = manager - wx.EVT_CLOSE(self, self.OnCloseWindow) + self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) - wx.EVT_MENU(self, wx.ID_EXIT, self.OnExit) - wx.EVT_MENU_RANGE(self, wx.ID_FILE1, wx.ID_FILE9, self.OnMRUFile) + self.Bind(wx.EVT_MENU, self.OnExit, id=wx.ID_EXIT) + self.Bind(wx.EVT_MENU_RANGE, self.OnMRUFile, id=wx.ID_FILE1, id2=wx.ID_FILE9) - wx.EVT_MENU(self, wx.ID_NEW, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_OPEN, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_CLOSE_ALL, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_CLOSE, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_REVERT, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_SAVE, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_SAVEAS, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_UNDO, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_REDO, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_PRINT, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_PRINT_SETUP, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_PREVIEW, self.ProcessEvent) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_NEW) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_OPEN) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_CLOSE_ALL) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_CLOSE) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_REVERT) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_SAVE) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_SAVEAS) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_UNDO) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_REDO) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_PRINT) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_PRINT_SETUP) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_PREVIEW) - wx.EVT_UPDATE_UI(self, wx.ID_NEW, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_OPEN, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_CLOSE_ALL, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_CLOSE, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_REVERT, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_SAVE, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_SAVEAS, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_UNDO, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_REDO, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_PRINT, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_PRINT_SETUP, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_PREVIEW, self.ProcessUpdateUIEvent) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_NEW) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_OPEN) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_CLOSE_ALL) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_CLOSE) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_REVERT) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_SAVE) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_SAVEAS) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_UNDO) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_REDO) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_PRINT) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_PRINT_SETUP) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_PREVIEW) def ProcessEvent(self, event): @@ -2469,38 +2469,38 @@ class DocChildFrame(wx.Frame): Constructor. """ wx.Frame.__init__(self, frame, id, title, pos, size, style, name) - wx.EVT_ACTIVATE(self, self.OnActivate) - wx.EVT_CLOSE(self, self.OnCloseWindow) + self.Bind(wx.EVT_ACTIVATE, self.OnActivate) + self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) self._childDocument = doc self._childView = view if view: view.SetFrame(self) - wx.EVT_MENU(self, wx.ID_NEW, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_OPEN, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_CLOSE_ALL, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_CLOSE, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_REVERT, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_SAVE, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_SAVEAS, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_UNDO, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_REDO, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_PRINT, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_PRINT_SETUP, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_PREVIEW, self.ProcessEvent) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_NEW) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_OPEN) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_CLOSE_ALL) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_CLOSE) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_REVERT) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_SAVE) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_SAVEAS) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_UNDO) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_REDO) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_PRINT) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_PRINT_SETUP) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_PREVIEW) - wx.EVT_UPDATE_UI(self, wx.ID_NEW, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_OPEN, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_CLOSE_ALL, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_CLOSE, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_REVERT, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_SAVE, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_SAVEAS, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_UNDO, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_REDO, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_PRINT, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_PRINT_SETUP, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_PREVIEW, self.ProcessUpdateUIEvent) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_NEW) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_OPEN) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_CLOSE_ALL) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_CLOSE) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_REVERT) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_SAVE) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_SAVEAS) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_UNDO) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_REDO) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_PRINT) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_PRINT_SETUP) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_PREVIEW) def ProcessEvent(self, event): @@ -2612,36 +2612,36 @@ class DocMDIParentFrame(wx.MDIParentFrame): wx.MDIParentFrame.__init__(self, frame, id, title, pos, size, style, name) self._docManager = manager - wx.EVT_CLOSE(self, self.OnCloseWindow) + self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) - wx.EVT_MENU(self, wx.ID_EXIT, self.OnExit) - wx.EVT_MENU_RANGE(self, wx.ID_FILE1, wx.ID_FILE9, self.OnMRUFile) + self.Bind(wx.EVT_MENU, self.OnExit, id=wx.ID_EXIT) + self.Bind(wx.EVT_MENU_RANGE, self.OnMRUFile, id=wx.ID_FILE1, id2=wx.ID_FILE9) - wx.EVT_MENU(self, wx.ID_NEW, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_OPEN, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_CLOSE_ALL, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_CLOSE, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_REVERT, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_SAVE, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_SAVEAS, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_UNDO, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_REDO, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_PRINT, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_PRINT_SETUP, self.ProcessEvent) - wx.EVT_MENU(self, wx.ID_PREVIEW, self.ProcessEvent) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_NEW) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_OPEN) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_CLOSE_ALL) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_CLOSE) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_REVERT) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_SAVE) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_SAVEAS) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_UNDO) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_REDO) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_PRINT) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_PRINT_SETUP) + self.Bind(wx.EVT_MENU, self.ProcessEvent, id=wx.ID_PREVIEW) - wx.EVT_UPDATE_UI(self, wx.ID_NEW, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_OPEN, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_CLOSE_ALL, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_CLOSE, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_REVERT, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_SAVE, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_SAVEAS, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_UNDO, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_REDO, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_PRINT, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_PRINT_SETUP, self.ProcessUpdateUIEvent) - wx.EVT_UPDATE_UI(self, wx.ID_PREVIEW, self.ProcessUpdateUIEvent) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_NEW) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_OPEN) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_CLOSE_ALL) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_CLOSE) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_REVERT) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_SAVE) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_SAVEAS) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_UNDO) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_REDO) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_PRINT) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_PRINT_SETUP) + self.Bind(wx.EVT_UPDATE_UI, self.ProcessUpdateUIEvent, id=wx.ID_PREVIEW) def ProcessEvent(self, event): @@ -2723,8 +2723,8 @@ class DocMDIChildFrame(wx.MDIChildFrame): # self.Create(doc, view, frame, id, title, pos, size, style, name) self._activeEvent = None self._activated = 0 - wx.EVT_ACTIVATE(self, self.OnActivate) - wx.EVT_CLOSE(self, self.OnCloseWindow) + self.Bind(wx.EVT_ACTIVATE, self.OnActivate) + self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) if frame: # wxBug: For some reason the EVT_ACTIVATE event is not getting triggered for the first mdi client window that is opened so we have to do it manually mdiChildren = filter(lambda x: isinstance(x, wx.MDIChildFrame), frame.GetChildren())