fixed sending 2 events (normal and bogus cancel one) when ending to edit a tree ctrl...

[wxWidgets.git] / wxPython / wx / py / editor.py

diff --git a/wxPython/wx/py/editor.py b/wxPython/wx/py/editor.py
index 6a547188f74bbf355cd8f6a6ec12244d4baabcc0..be2f521b9c2c5addcb62f7c42fe07da972463f21 100644 (file)
--- a/wxPython/wx/py/editor.py
+++ b/wxPython/wx/py/editor.py
@@ -14,12 +14,6 @@ import frame
 from shell import Shell
 import version
 
 from shell import Shell
 import version
 

-try:
-    True
-except NameError:
-    True = 1==1
-    False = 1==0
-

 
 class EditorFrame(frame.Frame):
     """Frame containing one editor."""
 
 class EditorFrame(frame.Frame):
     """Frame containing one editor."""


@@ -371,7 +365,7 @@ class EditorNotebook(wx.Notebook):
 
     def __init__(self, parent):
         """Create EditorNotebook instance."""
 
     def __init__(self, parent):
         """Create EditorNotebook instance."""

-        wx.Notebook.__init__(self, parent, id=-1, style=wx.NO_FULL_REPAINT_ON_RESIZE)
+        wx.Notebook.__init__(self, parent, id=-1, style=wx.CLIP_CHILDREN)

         wx.EVT_NOTEBOOK_PAGE_CHANGING(self, self.GetId(),
                                       self.OnPageChanging)
         wx.EVT_NOTEBOOK_PAGE_CHANGED(self, self.GetId(),
         wx.EVT_NOTEBOOK_PAGE_CHANGING(self, self.GetId(),
                                       self.OnPageChanging)
         wx.EVT_NOTEBOOK_PAGE_CHANGED(self, self.GetId(),


@@ -613,15 +607,18 @@ class Editor:
 
     def getStatus(self):
         """Return (filepath, line, column) status tuple."""
 
     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:
         else:

-            name = ''
-        status = (name, line, col)
-        return status
+            return ('', 0, 0)

 
     def getText(self):
         """Return contents of editor."""
 
     def getText(self):
         """Return contents of editor."""