Import numpy.oldnumeric

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

diff --git a/wxPython/wx/lib/editor/editor.py b/wxPython/wx/lib/editor/editor.py
index d0a67cbeef8d7a3b2390f33b54313810e45541b2..d94a8cd8c5b12235211b9794d46cde1466e9cb1b 100644 (file)
--- a/wxPython/wx/lib/editor/editor.py
+++ b/wxPython/wx/lib/editor/editor.py
@@ -483,6 +483,7 @@ class Editor(wx.ScrolledWindow):
         self.SelectEnd = None
         self.UpdateView()
         self.CaptureMouse()
         self.SelectEnd = None
         self.UpdateView()
         self.CaptureMouse()

+        self.SetFocus()

 
     def OnLeftUp(self, event):
         if not self.HasCapture():
 
     def OnLeftUp(self, event):
         if not self.HasCapture():


@@ -551,12 +552,13 @@ class Editor(wx.ScrolledWindow):
 
 
     def AdjustScrollbars(self):
 
 
     def AdjustScrollbars(self):

-        for i in range(2):
-            self.SetCharDimensions()
-            self.scroller.SetScrollbars(
-                self.fw, self.fh,
-                self.CalcMaxLineLen()+3, max(self.LinesInFile()+1, self.sh),
-                self.sx, self.sy)
+        if self:
+            for i in range(2):
+                self.SetCharDimensions()
+                self.scroller.SetScrollbars(
+                    self.fw, self.fh,
+                    self.CalcMaxLineLen()+3, max(self.LinesInFile()+1, self.sh),
+                    self.sx, self.sy)

 
 #------------ backspace, delete, return
 
 
 #------------ backspace, delete, return
 


@@ -940,7 +942,7 @@ class Editor(wx.ScrolledWindow):
         self.AdjustScrollbars()
 
     def OnChar(self, event):
         self.AdjustScrollbars()
 
     def OnChar(self, event):

-        key = event.KeyCode()
+        key = event.GetKeyCode()

         filters = [self.AltKey,
                    self.MoveSpecialControlKey,
                    self.ControlKey,
         filters = [self.AltKey,
                    self.MoveSpecialControlKey,
                    self.ControlKey,