two fixes from Justin Bradford

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

diff --git a/wxPython/demo/wxComboBox.py b/wxPython/demo/wxComboBox.py
index f3f8de8176213693c4d7de613b2e3b04b951097a..13e8fced0d210fc72564aaf1eb7e392a21866f7c 100644 (file)
--- a/wxPython/demo/wxComboBox.py
+++ b/wxPython/demo/wxComboBox.py
@@ -1,31 +1,60 @@
-

 from wxPython.wx import *
 
 #---------------------------------------------------------------------------
 
 class TestComboBox(wxPanel):
 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)
 
         sampleList = ['zero', 'one', 'two', 'three', 'four', 'five',
     def __init__(self, parent, log):
         self.log = log
         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))
                       '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))

-        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_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, evt):
+        cb = evt.GetEventObject()
+        data = cb.GetClientData(cb.GetSelection())
+        self.log.WriteText('EvtComboBox: %s\nClientData: %s\n' % (evt.GetString(), data))

 
 

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

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


@@ -41,43 +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.
 
 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.
 

-A combobox permits a single selection only. Combobox items are numbered from zero.
-
-wxComboBox()
------------------------
-
-Default constructor.
-
-wxComboBox(wxWindow* parent, wxWindowID id, const wxString& value = "", const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, int n, const wxString choices[], long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = "comboBox")
-
-Constructor, creating and showing a combobox.
-
-Parameters
--------------------
-
-parent = Parent window. Must not be NULL.
-
-id = Window identifier. A value of -1 indicates a default value.
-
-pos = Window position.
-
-size = Window size. If the default size (-1, -1) is specified then the window is sized appropriately.
-
-n = Number of strings with which to initialise the control.
+"""

 
 

-choices = An array of strings with which to initialise the control.

 
 

-style = Window style. See wxComboBox.

 
 

-validator = Window validator.
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])

 
 

-name = Window name.
-"""