Correct compile errors in non-unicode build

[wxWidgets.git] / wxPython / demo / KeyEvents.py

diff --git a/wxPython/demo/KeyEvents.py b/wxPython/demo/KeyEvents.py
index c992865219dbec3088f53c97e749331ee8e5614a..b0a0e6f870c9276c3ce9ca00171ce29a3133039d 100644 (file)
--- a/wxPython/demo/KeyEvents.py
+++ b/wxPython/demo/KeyEvents.py
@@ -1,15 +1,3 @@
-# 11/19/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o Updated for wx namespace
-# 
-# 11/29/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o lib.mixins.listctrl needs wx renamer applied.
-# 
-# 12/21/2003 - Jeff Grimmett (grimmtooth@softhome.net)
-#
-# o wxListCtrlAutoWidthMixin -> ListCtrlAutoWidthMixin 
-#

 
 import  wx
 import  wx.lib.mixins.listctrl  as  listmix
 
 import  wx
 import  wx.lib.mixins.listctrl  as  listmix


@@ -219,11 +207,12 @@ class KeyLog(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin):
         self.InsertColumn(1, "Key Name")
         self.InsertColumn(2, "Key Code")
         self.InsertColumn(3, "Modifiers")
         self.InsertColumn(1, "Key Name")
         self.InsertColumn(2, "Key Code")
         self.InsertColumn(3, "Modifiers")

-        self.InsertColumn(4, "RawKeyCode")
-        self.InsertColumn(5, "RawKeyFlags")
-        self.InsertColumn(6, "")
+        self.InsertColumn(4, "Unicode")
+        self.InsertColumn(5, "RawKeyCode")
+        self.InsertColumn(6, "RawKeyFlags")
+        self.InsertColumn(7, "")

 
 

-        for x in range(6):
+        for x in range(7):

             self.SetColumnWidth(x, wx.LIST_AUTOSIZE_USEHEADER)
 
         self.SetColumnWidth(1, 125)
             self.SetColumnWidth(x, wx.LIST_AUTOSIZE_USEHEADER)
 
         self.SetColumnWidth(1, 125)


@@ -257,8 +246,9 @@ class KeyLog(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin):
         self.SetStringItem(id, 1, keyname)
         self.SetStringItem(id, 2, str(keycode))
         self.SetStringItem(id, 3, modifiers)
         self.SetStringItem(id, 1, keyname)
         self.SetStringItem(id, 2, str(keycode))
         self.SetStringItem(id, 3, modifiers)

-        self.SetStringItem(id, 4, str(evt.GetRawKeyCode()))
-        self.SetStringItem(id, 5, str(evt.GetRawKeyFlags()))
+        self.SetStringItem(id, 4, str(evt.GetUnicodeKey()))
+        self.SetStringItem(id, 5, str(evt.GetRawKeyCode()))
+        self.SetStringItem(id, 6, str(evt.GetRawKeyFlags()))

 
         #print ( id, evType, keyname, str(keycode), modifiers, str(evt.GetRawKeyCode()), str(evt.GetRawKeyFlags()))
 
 
         #print ( id, evType, keyname, str(keycode), modifiers, str(evt.GetRawKeyCode()), str(evt.GetRawKeyFlags()))
 


@@ -277,7 +267,7 @@ class TestPanel(wx.Panel):
         self.log = log
         wx.Panel.__init__(self, parent, -1, style=0)
         self.keysink = KeySink(self)
         self.log = log
         wx.Panel.__init__(self, parent, -1, style=0)
         self.keysink = KeySink(self)

-        self.keysink.SetSize((100, 65))
+        self.keysink.SetMinSize((100, 65))

         self.keylog = KeyLog(self)
 
         btn = wx.Button(self, -1, "Clear Log")
         self.keylog = KeyLog(self)
 
         btn = wx.Button(self, -1, "Clear Log")


@@ -353,5 +343,5 @@ It is meant to be used as a compatibility test for cross platform work.
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])