Don't override methods that are in wxControlWithItems

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

diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
index 841a0e47e67fcf72b338a72cf63e6e581879aaa5..8e1b0474f3cb05f6806cf6964a007ae6ef14b0b3 100644 (file)
--- a/wxPython/wx/py/shell.py
+++ b/wxPython/wx/py/shell.py
@@ -72,9 +72,10 @@ class ShellFrame(frame.Frame):
                'the other half is still in the oven.\n\n' + \
                'Shell Revision: %s\n' % self.shell.revision + \
                'Interpreter Revision: %s\n\n' % self.shell.interp.revision + \
+               'Platform: %s\n' % sys.platform + \
                'Python Version: %s\n' % sys.version.split()[0] + \
                'wxPython Version: %s\n' % wx.VERSION_STRING + \
-               'Platform: %s\n' % sys.platform
+               ('\t(%s)\n' % ", ".join(wx.PlatformInfo[1:])) 
         dialog = wx.MessageDialog(self, text, title,
                                   wx.OK | wx.ICON_INFORMATION)
         dialog.ShowModal()
@@ -179,7 +180,8 @@ class Shell(editwindow.EditWindow):
         editwindow.EditWindow.__init__(self, parent, id, pos, size, style)
         self.wrap()
         if locals is None:
-            locals = {}
+            import __main__
+            locals = __main__.__dict__
         # Grab these so they can be restored by self.redirect* methods.
         self.stdin = sys.stdin
         self.stdout = sys.stdout