Use GetKeyCode() instead of KeyCode()

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

diff --git a/wxPython/demo/ActiveX_IEHtmlWindow.py b/wxPython/demo/ActiveX_IEHtmlWindow.py
index c1356e4debf4acda5758af6e6fe2a78e14355769..bd4749db927b725cd6bcb7dc4d7baa077b8ad78d 100644 (file)
--- a/wxPython/demo/ActiveX_IEHtmlWindow.py
+++ b/wxPython/demo/ActiveX_IEHtmlWindow.py
@@ -105,7 +105,7 @@ class TestPanel(wx.Panel):
         self.ie.Navigate(url)
 
     def OnLocationKey(self, evt):
-        if evt.KeyCode() == wx.WXK_RETURN:
+        if evt.GetKeyCode() == wx.WXK_RETURN:
             URL = self.location.GetValue()
             self.location.Append(URL)
             self.ie.Navigate(URL)

diff --git a/wxPython/demo/GridEnterHandler.py b/wxPython/demo/GridEnterHandler.py
index bdcd8ccb7d8e392930f5f35de52430e8a09a7bcf..638eac61b57468ecce9bfc30c186e78cd45ceff9 100644 (file)
--- a/wxPython/demo/GridEnterHandler.py
+++ b/wxPython/demo/GridEnterHandler.py
@@ -20,7 +20,7 @@ class NewEnterHandlingGrid(gridlib.Grid):
 
 
     def OnKeyDown(self, evt):
-        if evt.KeyCode() != wx.WXK_RETURN:
+        if evt.GetKeyCode() != wx.WXK_RETURN:
             evt.Skip()
             return
 

diff --git a/wxPython/demo/StyledTextCtrl_2.py b/wxPython/demo/StyledTextCtrl_2.py
index e84bee509bd633725e2b75c7b528ee302e590d11..2c043c9155e9bcd5ebe0f1b4cda87f5ea4a7cf15 100644 (file)
--- a/wxPython/demo/StyledTextCtrl_2.py
+++ b/wxPython/demo/StyledTextCtrl_2.py
@@ -185,7 +185,7 @@ class PythonSTC(stc.StyledTextCtrl):
     def OnKeyPressed(self, event):
         if self.CallTipActive():
             self.CallTipCancel()
-        key = event.KeyCode()
+        key = event.GetKeyCode()
 
         if key == 32 and event.ControlDown():
             pos = self.GetCurrentPos()

diff --git a/wxPython/demo/Validator.py b/wxPython/demo/Validator.py
index 31dd044967e0243b81aaf10bd6d126db150fe8d1..0b83c95595ca323423c8afdd519bc567b8b0712c 100644 (file)
--- a/wxPython/demo/Validator.py
+++ b/wxPython/demo/Validator.py
@@ -34,7 +34,7 @@ class MyValidator(wx.PyValidator):
 
 
     def OnChar(self, event):
-        key = event.KeyCode()
+        key = event.GetKeyCode()
 
         if key < wx.WXK_SPACE or key == wx.WXK_DELETE or key > 255:
             event.Skip()

diff --git a/wxPython/wx/lib/buttons.py b/wxPython/wx/lib/buttons.py
index ea8fea98b5a49ae875e2ad72c6e694ebac0ed817..11c3e77860583b9c2fde845269dce5c5fca6c4e7 100644 (file)
--- a/wxPython/wx/lib/buttons.py
+++ b/wxPython/wx/lib/buttons.py
@@ -347,14 +347,14 @@ class GenButton(wx.PyControl):
 
 
     def OnKeyDown(self, event):
-        if self.hasFocus and event.KeyCode() == ord(" "):
+        if self.hasFocus and event.GetKeyCode() == ord(" "):
             self.up = False
             self.Refresh()
         event.Skip()
 
 
     def OnKeyUp(self, event):
-        if self.hasFocus and event.KeyCode() == ord(" "):
+        if self.hasFocus and event.GetKeyCode() == ord(" "):
             self.up = True
             self.Notify()
             self.Refresh()
@@ -551,7 +551,7 @@ class __ToggleMixin:
         event.Skip()
 
     def OnKeyUp(self, event):
-        if self.hasFocus and event.KeyCode() == ord(" "):
+        if self.hasFocus and event.GetKeyCode() == ord(" "):
             self.up = not self.up
             self.Notify()
             self.Refresh()

diff --git a/wxPython/wx/lib/calendar.py b/wxPython/wx/lib/calendar.py
index 78071e666b6517489d400cac9a2094be52e861ee..d65973c41150fac5f81b1b0d1061666e6fc3d8db 100644 (file)
--- a/wxPython/wx/lib/calendar.py
+++ b/wxPython/wx/lib/calendar.py
@@ -771,7 +771,7 @@ class Calendar( wx.PyControl ):
             event.Skip()
             return
         
-        key_code = event.KeyCode()
+        key_code = event.GetKeyCode()
         
         if key_code == wx.WXK_TAB:
             forward = not event.ShiftDown()

diff --git a/wxPython/wx/lib/editor/editor.py b/wxPython/wx/lib/editor/editor.py
index 943e42dd27a06185f8e449ac343c9c8d44043f07..d94a8cd8c5b12235211b9794d46cde1466e9cb1b 100644 (file)
--- a/wxPython/wx/lib/editor/editor.py
+++ b/wxPython/wx/lib/editor/editor.py
@@ -942,7 +942,7 @@ class Editor(wx.ScrolledWindow):
         self.AdjustScrollbars()
 
     def OnChar(self, event):
-        key = event.KeyCode()
+        key = event.GetKeyCode()
         filters = [self.AltKey,
                    self.MoveSpecialControlKey,
                    self.ControlKey,

diff --git a/wxPython/wx/lib/intctrl.py b/wxPython/wx/lib/intctrl.py
index 65ff2e58fac525f009aa347ed0545f3683ce3f8c..897045a5069b4a169321393b75ac4acdc29687e9 100644 (file)
--- a/wxPython/wx/lib/intctrl.py
+++ b/wxPython/wx/lib/intctrl.py
@@ -109,7 +109,7 @@ class IntValidator( wx.PyValidator ):
         selected.  Leading zeros are removed if introduced by selection,
         and are prevented from being inserted.
         """
-        key = event.KeyCode()
+        key = event.GetKeyCode()
         ctrl = event.GetEventObject()
 
 

diff --git a/wxPython/wx/lib/mvctree.py b/wxPython/wx/lib/mvctree.py
index dd84720c36d8350657ba003ecf0f95a142cbb015..eb49ea03de1b163335605472de5749f52f8878e8 100644 (file)
--- a/wxPython/wx/lib/mvctree.py
+++ b/wxPython/wx/lib/mvctree.py
@@ -404,9 +404,9 @@ class FileEditor(Editor):
 
 
     def _key(self, evt):
-        if evt.KeyCode() == wx.WXK_RETURN:
+        if evt.GetKeyCode() == wx.WXK_RETURN:
             self.EndEdit(True)
-        elif evt.KeyCode() == wx.WXK_ESCAPE:
+        elif evt.GetKeyCode() == wx.WXK_ESCAPE:
             self.EndEdit(False)
         else:
             evt.Skip()

diff --git a/wxPython/wx/lib/pyshell.py b/wxPython/wx/lib/pyshell.py
index 86d127a77f2e5324aba174685711f78a1b6a437f..1dca90da9ef7f74f19ad8caf743cb5033a7ac584 100644 (file)
--- a/wxPython/wx/lib/pyshell.py
+++ b/wxPython/wx/lib/pyshell.py
@@ -216,7 +216,7 @@ class PyShellWindow(stc.StyledTextCtrl, InteractiveInterpreter):
 
 
     def OnKey(self, evt):
-        key = evt.KeyCode()
+        key = evt.GetKeyCode()
         if key == wx.WXK_RETURN:
             pos = self.GetCurrentPos()
             lastPos = self.GetTextLength()

diff --git a/wxPython/wx/lib/shell.py b/wxPython/wx/lib/shell.py
index 428a2cbbef43ada6af7599c117b23099c37fa444..0f78ac3ed5c9c13182d95e6f27535defc330fe2b 100644 (file)
--- a/wxPython/wx/lib/shell.py
+++ b/wxPython/wx/lib/shell.py
@@ -109,7 +109,7 @@ class PyShellInput(wx.Panel):
     def OnChar(self, event):
         """called on CHARevent.  executes input on newline"""
         # print "On Char:", event.__dict__.keys()
-        if event.KeyCode() !=wx.WXK_RETURN:
+        if event.GetKeyCode() !=wx.WXK_RETURN:
             # not of our business
             event.Skip()
             return

diff --git a/wxPython/wx/lib/vtk.py b/wxPython/wx/lib/vtk.py
index 676932d215b77d65fc9c16634600b0f541468f94..c726fade6c05431ad9c5ce8427a1a095c160dffd 100644 (file)
--- a/wxPython/wx/lib/vtk.py
+++ b/wxPython/wx/lib/vtk.py
@@ -318,7 +318,7 @@ class wxVTKRenderWindow(wxVTKRenderWindowBase):
 
 
     def OnChar(self, event):
-        key = event.KeyCode()
+        key = event.GetKeyCode()
         if (key == ord('r')) or (key == ord('R')):
             self.Reset()
         elif (key == ord('w')) or (key == ord('W')):

diff --git a/wxPython/wx/py/PyShell.py b/wxPython/wx/py/PyShell.py
index 2af5143ecdbb3207ff72ab0a8601b1d2e778c263..299cc4f5380d5cef367d1c9c23361869e7531119 100644 (file)
--- a/wxPython/wx/py/PyShell.py
+++ b/wxPython/wx/py/PyShell.py
@@ -12,6 +12,9 @@ __cvsid__ = "$Id$"
 __revision__ = "$Revision$"[11:-2]
 
 import wx
+import os
+print "PID:", os.getpid()
+raw_input("...")
 
 class App(wx.App):
     """PyShell standalone application."""

diff --git a/wxPython/wx/py/editor.py b/wxPython/wx/py/editor.py
index 1271d8760ddf8286168118c12f23aca47c6a138b..b21c691193c21238b43c37e2d5d31132fdb5b917 100644 (file)
--- a/wxPython/wx/py/editor.py
+++ b/wxPython/wx/py/editor.py
@@ -643,7 +643,7 @@ class Editor:
         Only receives an event if OnKeyDown calls event.Skip() for the
         corresponding event."""
 
-        key = event.KeyCode()
+        key = event.GetKeyCode()
         if key in self.autoCompleteKeys:
             # Usually the dot (period) key activates auto completion.
             if self.window.AutoCompActive(): 
@@ -671,7 +671,7 @@ class Editor:
     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.window.AutoCompActive():
             event.Skip()

diff --git a/wxPython/wx/py/shell.py b/wxPython/wx/py/shell.py
index c86ced152d88d50d8e0d5498df966302e1c2aa18..fe60b38221bd8c3dc6a8a3ff8b160390d1c713d9 100644 (file)
--- a/wxPython/wx/py/shell.py
+++ b/wxPython/wx/py/shell.py
@@ -417,7 +417,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 +452,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()