second merge of the 2.2 branch (RL)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/wxPython/lib/pyshell.py

@@ -17,8 +17,8 @@ inside a wxStyledTextCtrl, similar to the Python shell windows found in
 IDLE and PythonWin.
 
 There is still much to be done to improve this class, such as line
-buffering/recall, autoindent, calltips, autocomplete, etc...  But
-it's a good start.
+buffering/recall, autoindent, calltips, autocomplete, fixing the colourizer,
+etc...  But it's a good start.
 
 """
 
@@ -107,7 +107,7 @@ class PyShellWindow(wxStyledTextCtrl, InteractiveInterpreter):
         # Event handlers
         EVT_KEY_DOWN(self, self.OnKey)
         EVT_STC_UPDATEUI(self, ID, self.OnUpdateUI)
-        EVT_STC_STYLENEEDED(self, ID, self.OnStyle)
+        #EVT_STC_STYLENEEDED(self, ID, self.OnStyle)
 
 
     def GetLocals(self): return self.locals
@@ -126,8 +126,8 @@ class PyShellWindow(wxStyledTextCtrl, InteractiveInterpreter):
         """
         p = self.props
 
-        self.SetEdgeMode(wxSTC_EDGE_LINE)
-        self.SetEdgeColumn(80)
+        #self.SetEdgeMode(wxSTC_EDGE_LINE)
+        #self.SetEdgeColumn(80)
 
 
         # set the selection margin and window margin