##// END OF EJS Templates
BUG: Correct some trailing wx2.6 incompatibilities
Gael Varoquaux -
Show More
@@ -445,7 +445,7 b' class WxController(ConsoleWidget, PrefilterFrontEnd):'
445 # Go to first line, for seemless history up.
445 # Go to first line, for seemless history up.
446 self.GotoPos(self.current_prompt_pos)
446 self.GotoPos(self.current_prompt_pos)
447 # Down history
447 # Down history
448 elif event.KeyCode == wx.WXK_DOWN and (
448 elif key_code == wx.WXK_DOWN and (
449 event.ControlDown() or
449 event.ControlDown() or
450 current_line_num == self.LineCount -1
450 current_line_num == self.LineCount -1
451 ):
451 ):
@@ -453,7 +453,7 b' class WxController(ConsoleWidget, PrefilterFrontEnd):'
453 if new_buffer is not None:
453 if new_buffer is not None:
454 self.input_buffer = new_buffer
454 self.input_buffer = new_buffer
455 # Tab-completion
455 # Tab-completion
456 elif event.KeyCode == ord('\t'):
456 elif key_code == ord('\t'):
457 current_line, current_line_num = self.CurLine
457 current_line, current_line_num = self.CurLine
458 if not re.match(r'^%s\s*$' % self.continuation_prompt(),
458 if not re.match(r'^%s\s*$' % self.continuation_prompt(),
459 current_line):
459 current_line):
@@ -462,7 +462,7 b' class WxController(ConsoleWidget, PrefilterFrontEnd):'
462 wx.CallAfter(self._popup_completion, create=True)
462 wx.CallAfter(self._popup_completion, create=True)
463 else:
463 else:
464 event.Skip()
464 event.Skip()
465 elif event.KeyCode == wx.WXK_BACK:
465 elif key_code == wx.WXK_BACK:
466 # If characters where erased, check if we have to
466 # If characters where erased, check if we have to
467 # remove a line.
467 # remove a line.
468 # XXX: What about DEL?
468 # XXX: What about DEL?
@@ -497,7 +497,7 b' class WxController(ConsoleWidget, PrefilterFrontEnd):'
497 def _on_key_up(self, event, skip=True):
497 def _on_key_up(self, event, skip=True):
498 """ Called when any key is released.
498 """ Called when any key is released.
499 """
499 """
500 if event.KeyCode in (59, ord('.')):
500 if event.GetKeyCode() in (59, ord('.')):
501 # Intercepting '.'
501 # Intercepting '.'
502 event.Skip()
502 event.Skip()
503 wx.CallAfter(self._popup_completion, create=True)
503 wx.CallAfter(self._popup_completion, create=True)
General Comments 0
You need to be logged in to leave comments. Login now