X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/493f1553fdfd276ed9944c5f1c070ee34be13b52..ce50c4d1c61de1b30c32923b35527a54c0c32751:/wxPython/demo/wxComboBox.py

diff --git a/wxPython/demo/wxComboBox.py b/wxPython/demo/wxComboBox.py
index 1795e889b2..37e52cbb37 100644
--- a/wxPython/demo/wxComboBox.py
+++ b/wxPython/demo/wxComboBox.py
@@ -1,9 +1,15 @@
-
 from wxPython.wx import *
 
 #---------------------------------------------------------------------------
 
 class TestComboBox(wxPanel):
+    def OnSetFocus(self, evt):
+        print "OnSetFocus"
+        evt.Skip()
+    def OnKillFocus(self, evt):
+        print "OnKillFocus"
+        evt.Skip()
+
     def __init__(self, parent, log):
         self.log = log
         wxPanel.__init__(self, parent, -1)
@@ -15,17 +21,34 @@ class TestComboBox(wxPanel):
                                wxPoint(8, 10))
 
         wxStaticText(self, -1, "Select one:", wxPoint(15, 50), wxSize(75, 18))
-        wxComboBox(self, 500, "default value", wxPoint(80, 50), wxSize(95, -1),
-                   sampleList, wxCB_DROPDOWN)
+        cb = wxComboBox(self, 500, "default value", wxPoint(90, 50), wxSize(95, -1),
+                        sampleList, wxCB_DROPDOWN)#|wxTE_PROCESS_ENTER)
         EVT_COMBOBOX(self, 500, self.EvtComboBox)
         EVT_TEXT(self, 500, self.EvtText)
+        EVT_TEXT_ENTER(self, 500, self.EvtTextEnter)
+        EVT_SET_FOCUS(cb, self.OnSetFocus)
+        EVT_KILL_FOCUS(cb, self.OnKillFocus)
+
+        cb.Append("foo", "This is some client data for this item")
 
+        cb = wxComboBox(self, 501, "default value", wxPoint(90, 80), wxSize(95, -1),
+                        [], wxCB_SIMPLE)
+        for item in sampleList:
+            cb.Append(item, item.upper())
+        EVT_COMBOBOX(self, 501, self.EvtComboBox)
+        EVT_TEXT(self, 501, self.EvtText)
 
-    def EvtComboBox(self, event):
-        self.log.WriteText('EvtComboBox: %s\n' % event.GetString())
 
-    def EvtText(self, event):
-        self.log.WriteText('EvtText: %s\n' % event.GetString())
+    def EvtComboBox(self, evt):
+        cb = evt.GetEventObject()
+        data = cb.GetClientData(cb.GetSelection())
+        self.log.WriteText('EvtComboBox: %s\nClientData: %s\n' % (evt.GetString(), data))
+
+    def EvtText(self, evt):
+        self.log.WriteText('EvtText: %s\n' % evt.GetString())
+
+    def EvtTextEnter(self, evt):
+        self.log.WriteText('EvtTextEnter: does this work?')
 
 #---------------------------------------------------------------------------
 
@@ -41,12 +64,15 @@ def runTest(frame, nb, log):
 
 
 
+overview = """\
+A combobox is like a combination of an edit control and a listbox. It can be displayed as static list with editable or read-only text field; or a drop-down list with text field; or a drop-down list without a text field.
 
+"""
 
 
 
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
 
-overview = """\
-A combobox is like a combination of an edit control and a listbox. It can be displayed as static list with editable or read-only text field; or a drop-down list with text field; or a drop-down list without a text field.
-
-"""