X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8eca4fef106b8327e2e55636de3f68a511a4c392..0a5bb138a71dfc1c706fc0858fb2801500e2c2e8:/wxPython/demo/ComboBox.py

diff --git a/wxPython/demo/ComboBox.py b/wxPython/demo/ComboBox.py
index 9cebf42113..e1335dbe3d 100644
--- a/wxPython/demo/ComboBox.py
+++ b/wxPython/demo/ComboBox.py
@@ -40,19 +40,18 @@ class TestComboBox(wx.Panel):
 
         # This combobox is created with no values initially.
         cb = wx.ComboBox(
-            self, 501, "default value", (90, 80), (95, -1), [], wx.CB_SIMPLE)
+            self, 501, "default value", (90, 80), (95, -1), [], wx.CB_DROPDOWN)
 
         # Here we dynamically add our values to the second combobox.
         for item in sampleList:
             cb.Append(item, item.upper())
 
         self.Bind(wx.EVT_COMBOBOX, self.EvtComboBox, cb)
-        self.Bind(wx.EVT_COMBOBOX, self.EvtText, cb)
 
     # When the user selects something, we go here.
     def EvtComboBox(self, evt):
         cb = evt.GetEventObject()
-        data = cb.GetClientData(cb.GetSelection())
+        data = cb.GetClientData(evt.GetSelection())
         self.log.WriteText('EvtComboBox: %s\nClientData: %s\n' % (evt.GetString(), data))
 
         if evt.GetString() == 'one':
@@ -61,11 +60,13 @@ class TestComboBox(wx.Panel):
     # Capture events every time a user hits a key in the text entry field.
     def EvtText(self, evt):
         self.log.WriteText('EvtText: %s\n' % evt.GetString())
+        evt.Skip()
 
     # Capture events when the user types something into the control then
     # hits ENTER.
     def EvtTextEnter(self, evt):
         self.log.WriteText('EvtTextEnter: %s' % evt.GetString())
+        evt.Skip()
 
 #---------------------------------------------------------------------------