X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f4cc34f375fbff74006f3057e90dd01c426f580..a8988cb339baf4fb5e8ebc8065e0324a9e96c208:/wxPython/wx/py/shell.py

diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
index c86ced152d..ec8d7f4dae 100644
--- a/wxPython/wx/py/shell.py
+++ b/wxPython/wx/py/shell.py
@@ -343,11 +343,12 @@ class Shell(editwindow.EditWindow):
     def showIntro(self, text=''):
         """Display introductory text in the shell."""
         if text:
-            if not text.endswith(os.linesep):
-                text += os.linesep
             self.write(text)
         try:
-            self.write(self.interp.introText)
+            if self.interp.introText:
+                if text and not text.endswith(os.linesep):
+                    self.write(os.linesep)
+                self.write(self.interp.introText)
         except AttributeError:
             pass
 
@@ -417,7 +418,7 @@ Platform: %s""" % \
         # 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.
@@ -452,7 +453,7 @@ Platform: %s""" % \
     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()