X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14a1e28567de23c586bc80017073d0c39f8d18f..2091f5e71a1d04cf9277565121725f764d466a06:/wxPython/wx/py/editor.py diff --git a/wxPython/wx/py/editor.py b/wxPython/wx/py/editor.py index 6a547188f7..8dc8981798 100644 --- a/wxPython/wx/py/editor.py +++ b/wxPython/wx/py/editor.py @@ -14,12 +14,6 @@ import frame from shell import Shell import version -try: - True -except NameError: - True = 1==1 - False = 1==0 - class EditorFrame(frame.Frame): """Frame containing one editor.""" @@ -36,7 +30,7 @@ class EditorFrame(frame.Frame): self._defaultText = title + ' - the tastiest Python editor.' self._statusText = self._defaultText self.SetStatusText(self._statusText) - wx.EVT_IDLE(self, self.OnIdle) + self.Bind(wx.EVT_IDLE, self.OnIdle) self._setup() if filename: self.bufferCreate(filename) @@ -143,7 +137,7 @@ class EditorFrame(frame.Frame): self.bufferDestroy() buffer = Buffer() self.panel = panel = wx.Panel(parent=self, id=-1) - wx.EVT_ERASE_BACKGROUND(panel, lambda x: x) + panel.Bind (wx.EVT_ERASE_BACKGROUND, lambda x: x) editor = Editor(parent=panel) panel.editor = editor sizer = wx.BoxSizer(wx.VERTICAL) @@ -324,7 +318,7 @@ class EditorNotebookFrame(EditorFrame): """Create new buffer.""" buffer = Buffer() panel = wx.Panel(parent=self.notebook, id=-1) - wx.EVT_ERASE_BACKGROUND(panel, lambda x: x) + panel.Bind(wx.EVT_ERASE_BACKGROUND, lambda x: x) editor = Editor(parent=panel) panel.editor = editor sizer = wx.BoxSizer(wx.VERTICAL) @@ -371,12 +365,10 @@ class EditorNotebook(wx.Notebook): def __init__(self, parent): """Create EditorNotebook instance.""" - wx.Notebook.__init__(self, parent, id=-1, style=wx.NO_FULL_REPAINT_ON_RESIZE) - wx.EVT_NOTEBOOK_PAGE_CHANGING(self, self.GetId(), - self.OnPageChanging) - wx.EVT_NOTEBOOK_PAGE_CHANGED(self, self.GetId(), - self.OnPageChanged) - wx.EVT_IDLE(self, self.OnIdle) + wx.Notebook.__init__(self, parent, id=-1, style=wx.CLIP_CHILDREN) + self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGING, self.OnPageChanging, id=self.GetId()) + self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnPageChanged, id=self.GetId()) + self.Bind(wx.EVT_IDLE, self.OnIdle) def OnIdle(self, event): """Event handler for idle time.""" @@ -558,7 +550,7 @@ class EditorShellNotebook(wx.Notebook): self.AddPage(page=self.editor.window, text='Editor', select=True) self.AddPage(page=self.shell, text='Shell') self.editor.setFocus() - wx.EVT_NOTEBOOK_PAGE_CHANGED(self, self.GetId(), self.OnPageChanged) + self.Bind(wx.EVT_NOTEBOOK_PAGE_CHANGED, self.OnPageChanged, id=self.GetId()) def OnPageChanged(self, event): """Page changed event handler.""" @@ -589,8 +581,8 @@ class Editor: self.id = self.window.GetId() self.buffer = None # Assign handlers for keyboard events. - wx.EVT_CHAR(self.window, self.OnChar) - wx.EVT_KEY_DOWN(self.window, self.OnKeyDown) + self.window.Bind(wx.EVT_CHAR, self.OnChar) + self.window.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown) def _setBuffer(self, buffer, text): """Set the editor to a buffer. Private callback called by buffer.""" @@ -613,15 +605,18 @@ class Editor: def getStatus(self): """Return (filepath, line, column) status tuple.""" - pos = self.window.GetCurrentPos() - line = self.window.LineFromPosition(pos) + 1 - col = self.window.GetColumn(pos) - if self.buffer: - name = self.buffer.doc.filepath or self.buffer.name + if self.window: + pos = self.window.GetCurrentPos() + line = self.window.LineFromPosition(pos) + 1 + col = self.window.GetColumn(pos) + if self.buffer: + name = self.buffer.doc.filepath or self.buffer.name + else: + name = '' + status = (name, line, col) + return status else: - name = '' - status = (name, line, col) - return status + return ('', 0, 0) def getText(self): """Return contents of editor."""