forgot to commit during last regeneration

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

diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
index dbd4c268dd178de109f5f763ac9fccfdf641d165..fe60b38221bd8c3dc6a8a3ff8b160390d1c713d9 100644 (file)
--- a/wxPython/wx/py/shell.py
+++ b/wxPython/wx/py/shell.py
@@ -168,6 +168,7 @@ class ShellFacade:
         d = self.__dict__
         d['other'] = other
         d['helpText'] = HELP_TEXT
         d = self.__dict__
         d['other'] = other
         d['helpText'] = HELP_TEXT

+        d['this'] = other.this

 
     def help(self):
         """Display some useful information about how to use the shell."""
 
     def help(self):
         """Display some useful information about how to use the shell."""


@@ -353,7 +354,7 @@ class Shell(editwindow.EditWindow):
     def setBuiltinKeywords(self):
         """Create pseudo keywords as part of builtins.
 
     def setBuiltinKeywords(self):
         """Create pseudo keywords as part of builtins.
 

-        This sets `close`, `exit` and `quit` to a helpful string.
+        This sets "close", "exit" and "quit" to a helpful string.

         """
         import __builtin__
         __builtin__.close = __builtin__.exit = __builtin__.quit = \
         """
         import __builtin__
         __builtin__.close = __builtin__.exit = __builtin__.quit = \


@@ -416,7 +417,7 @@ Platform: %s""" % \
         # commands/responses.
         if not self.CanEdit():
             return
         # commands/responses.
         if not self.CanEdit():
             return

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

         currpos = self.GetCurrentPos()
         stoppos = self.promptPosEnd
         # Return (Enter) needs to be ignored in this handler.
         currpos = self.GetCurrentPos()
         stoppos = self.promptPosEnd
         # Return (Enter) needs to be ignored in this handler.


@@ -451,7 +452,7 @@ Platform: %s""" % \
     def OnKeyDown(self, event):
         """Key down event handler."""
 
     def OnKeyDown(self, event):
         """Key down event handler."""
 

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

         # If the auto-complete window is up let it do its thing.
         if self.AutoCompActive():
             event.Skip()
         # If the auto-complete window is up let it do its thing.
         if self.AutoCompActive():
             event.Skip()