X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bbeffe4b0a42e66a3c155a7ba8af9af62086d3e..4a28b9b81cafbf10b32dacbdc4fe98944e3ff6c6:/wxPython/demo/wxComboBox.py

diff --git a/wxPython/demo/wxComboBox.py b/wxPython/demo/wxComboBox.py
index ec7eae36fe..b3dfc92739 100644
--- a/wxPython/demo/wxComboBox.py
+++ b/wxPython/demo/wxComboBox.py
@@ -1,4 +1,4 @@
-
+import string
 from wxPython.wx import *
 
 #---------------------------------------------------------------------------
@@ -22,17 +22,20 @@ class TestComboBox(wxPanel):
                                wxPoint(8, 10))
 
         wxStaticText(self, -1, "Select one:", wxPoint(15, 50), wxSize(75, 18))
-        cb = 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")
 
-        wxComboBox(self, 501, "default value", wxPoint(80, 80), wxSize(95, -1),
-                        sampleList, wxCB_SIMPLE)
+        cb = wxComboBox(self, 501, "default value", wxPoint(90, 80), wxSize(95, -1),
+                        [], wxCB_SIMPLE)
+        for item in sampleList:
+            cb.Append(item, string.upper(item))
         EVT_COMBOBOX(self, 501, self.EvtComboBox)
         EVT_TEXT(self, 501, self.EvtText)
 
@@ -45,6 +48,9 @@ class TestComboBox(wxPanel):
     def EvtText(self, evt):
         self.log.WriteText('EvtText: %s\n' % evt.GetString())
 
+    def EvtTextEnter(self, evt):
+        self.log.WriteText('EvtTextEnter: does this work?')
+
 #---------------------------------------------------------------------------
 
 def runTest(frame, nb, log):
@@ -59,12 +65,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.
-
-"""