corrected FSSpec to POSIX file name conversions for Mac OS X (Apple DevTools)

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

diff --git a/wxPython/demo/wxComboBox.py b/wxPython/demo/wxComboBox.py
index a985e6282170f7fec0488c535c159bac3ed5acff..11d46d5efd00bee1da69af9208649edb84859d36 100644 (file)
--- a/wxPython/demo/wxComboBox.py
+++ b/wxPython/demo/wxComboBox.py
@@ -23,13 +23,14 @@ class TestComboBox(wxPanel):
 
         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)
+                        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")
+        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)
@@ -37,11 +38,16 @@ class TestComboBox(wxPanel):
         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, event):
-        self.log.WriteText('EvtText: %s\n' % event.GetString())
+    def EvtText(self, evt):
+        self.log.WriteText('EvtText: %s\n' % evt.GetString())
+
+    def EvtTextEnter(self, evt):
+        self.log.WriteText('EvtTextEnter: does this work?')
 
 #---------------------------------------------------------------------------