X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/059a841c9651ba15b1ecc7a8c35189a813a122eb..0b9d8fe18e02e9d848d205c3f36812cd56fc1bcd:/wxPython/demo/wxComboBox.py

diff --git a/wxPython/demo/wxComboBox.py b/wxPython/demo/wxComboBox.py
index c2109a3d56..13e8fced0d 100644
--- a/wxPython/demo/wxComboBox.py
+++ b/wxPython/demo/wxComboBox.py
@@ -1,4 +1,3 @@
-
 from wxPython.wx import *
 
 #---------------------------------------------------------------------------
@@ -16,31 +15,46 @@ class TestComboBox(wxPanel):
         wxPanel.__init__(self, parent, -1)
 
         sampleList = ['zero', 'one', 'two', 'three', 'four', 'five',
+                      ##'this is a long item that needs a scrollbar...',
                       'six', 'seven', 'eight']
 
         wxStaticText(self, -1, "This example uses the wxComboBox control.",
                                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)
+        ##import win32api, win32con
+        ##win32api.SendMessage(cb.GetHandle(),
+        ##                     win32con.CB_SETHORIZONTALEXTENT,
+	##                     200, 0)
+
         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, 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 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 EvtText(self, event):
-        self.log.WriteText('EvtText: %s\n' % event.GetString())
+    def EvtTextEnter(self, evt):
+        self.log.WriteText('EvtTextEnter: does this work?')
 
 #---------------------------------------------------------------------------
 
@@ -56,12 +70,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.
-
-"""