Applied patch [ 1281902 ] fix for wxJoystick under Linux

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

diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
index a3ad8b7a72396197096c47078668f519bd043c20..8e1b0474f3cb05f6806cf6964a007ae6ef14b0b3 100644 (file)
--- a/wxPython/wx/py/shell.py
+++ b/wxPython/wx/py/shell.py
@@ -8,9 +8,6 @@ __author__ = "Patrick K. O'Brien <pobrien@orbtech.com>"
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
 __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 

-#from wxd.d_wx import wx
-#from wxd.d_stc import stc
-

 import wx
 from wx import stc
 
 import wx
 from wx import stc
 


@@ -28,12 +25,6 @@ from pseudo import PseudoFileOut
 from pseudo import PseudoFileErr
 from version import VERSION
 
 from pseudo import PseudoFileErr
 from version import VERSION
 

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

 sys.ps3 = '<-- '  # Input prompt.
 
 NAVKEYS = (wx.WXK_END, wx.WXK_LEFT, wx.WXK_RIGHT,
 sys.ps3 = '<-- '  # Input prompt.
 
 NAVKEYS = (wx.WXK_END, wx.WXK_LEFT, wx.WXK_RIGHT,


@@ -81,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 + \
                '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 + \
                '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()
         dialog = wx.MessageDialog(self, text, title,
                                   wx.OK | wx.ICON_INFORMATION)
         dialog.ShowModal()


@@ -154,6 +146,7 @@ Ctrl+=            Default font size.
             'ask',
             'autoCallTip',
             'autoComplete',
             'ask',
             'autoCallTip',
             'autoComplete',

+            'autoCompleteAutoHide',

             'autoCompleteCaseInsensitive',
             'autoCompleteIncludeDouble',
             'autoCompleteIncludeMagic',
             'autoCompleteCaseInsensitive',
             'autoCompleteIncludeDouble',
             'autoCompleteIncludeMagic',


@@ -187,7 +180,8 @@ class Shell(editwindow.EditWindow):
         editwindow.EditWindow.__init__(self, parent, id, pos, size, style)
         self.wrap()
         if locals is None:
         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
         # Grab these so they can be restored by self.redirect* methods.
         self.stdin = sys.stdin
         self.stdout = sys.stdout


@@ -825,6 +819,8 @@ Platform: %s""" % \
 
     def autoCompleteShow(self, command):
         """Display auto-completion popup list."""
 
     def autoCompleteShow(self, command):
         """Display auto-completion popup list."""

+        self.AutoCompSetAutoHide(self.autoCompleteAutoHide)
+        self.AutoCompSetIgnoreCase(self.autoCompleteCaseInsensitive)

         list = self.interp.getAutoCompleteList(command,
                     includeMagic=self.autoCompleteIncludeMagic,
                     includeSingle=self.autoCompleteIncludeSingle,
         list = self.interp.getAutoCompleteList(command,
                     includeMagic=self.autoCompleteIncludeMagic,
                     includeSingle=self.autoCompleteIncludeSingle,