Various fixes for X11 compilation

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

diff --git a/wxPython/demo/wxComboBox.py b/wxPython/demo/wxComboBox.py
index 1795e889b26f411a56df0eb0634859513d7d3ae0..ec7eae36fe32403ed666e3676bb238ba7d3f3da0 100644 (file)
--- a/wxPython/demo/wxComboBox.py
+++ b/wxPython/demo/wxComboBox.py
@@ -4,6 +4,13 @@ from wxPython.wx import *
 #---------------------------------------------------------------------------
 
 class TestComboBox(wxPanel):
 #---------------------------------------------------------------------------
 
 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)
     def __init__(self, parent, log):
         self.log = log
         wxPanel.__init__(self, parent, -1)


@@ -15,17 +22,28 @@ class TestComboBox(wxPanel):
                                wxPoint(8, 10))
 
         wxStaticText(self, -1, "Select one:", wxPoint(15, 50), wxSize(75, 18))
                                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(80, 50), wxSize(95, -1),
+                        sampleList, wxCB_DROPDOWN)

         EVT_COMBOBOX(self, 500, self.EvtComboBox)
         EVT_TEXT(self, 500, self.EvtText)
         EVT_COMBOBOX(self, 500, self.EvtComboBox)
         EVT_TEXT(self, 500, self.EvtText)

+        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)
+        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, event):
-        self.log.WriteText('EvtText: %s\n' % event.GetString())
+    def EvtText(self, evt):
+        self.log.WriteText('EvtText: %s\n' % evt.GetString())

 
 #---------------------------------------------------------------------------
 
 
 #---------------------------------------------------------------------------