only return matching modes from GetModes()

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

diff --git a/wxPython/demo/ListBox.py b/wxPython/demo/ListBox.py
index 83840b1238c3e1760c75a0b93a369e44c525ee75..0e1816a8aaee5c4489a7ec0ef4978446abbe762c 100644 (file)
--- a/wxPython/demo/ListBox.py
+++ b/wxPython/demo/ListBox.py
@@ -75,8 +75,8 @@ class TestListBox(wx.Panel):
                       'twelve', 'thirteen', 'fourteen']
 
         wx.StaticText(self, -1, "This example uses the wx.ListBox control.", (45, 10))
                       'twelve', 'thirteen', 'fourteen']
 
         wx.StaticText(self, -1, "This example uses the wx.ListBox control.", (45, 10))

-        wx.StaticText(self, -1, "Select one:", (15, 50), (65, 18))
-        self.lb1 = wx.ListBox(self, 60, (80, 50), (80, 120), sampleList, wx.LB_SINGLE)
+        wx.StaticText(self, -1, "Select one:", (15, 50))
+        self.lb1 = wx.ListBox(self, 60, (100, 50), (90, 120), sampleList, wx.LB_SINGLE)

         self.Bind(wx.EVT_LISTBOX, self.EvtListBox, self.lb1)
         self.Bind(wx.EVT_LISTBOX_DCLICK, self.EvtListBoxDClick, self.lb1)
         self.lb1.Bind(wx.EVT_RIGHT_UP, self.EvtRightButton)
         self.Bind(wx.EVT_LISTBOX, self.EvtListBox, self.lb1)
         self.Bind(wx.EVT_LISTBOX_DCLICK, self.EvtListBoxDClick, self.lb1)
         self.lb1.Bind(wx.EVT_RIGHT_UP, self.EvtRightButton)


@@ -85,8 +85,8 @@ class TestListBox(wx.Panel):
         self.lb1.SetClientData(2, "This one has data");
 
 
         self.lb1.SetClientData(2, "This one has data");
 
 

-        wx.StaticText(self, -1, "Select many:", (200, 50), (65, 18))
-        self.lb2 = wx.ListBox(self, 70, (280, 50), (80, 120), sampleList, wx.LB_EXTENDED)
+        wx.StaticText(self, -1, "Select many:", (220, 50))
+        self.lb2 = wx.ListBox(self, 70, (320, 50), (90, 120), sampleList, wx.LB_EXTENDED)

         self.Bind(wx.EVT_LISTBOX, self.EvtMultiListBox, self.lb2)
         self.lb2.Bind(wx.EVT_RIGHT_UP, self.EvtRightButton)
         self.lb2.SetSelection(0)
         self.Bind(wx.EVT_LISTBOX, self.EvtMultiListBox, self.lb2)
         self.lb2.Bind(wx.EVT_RIGHT_UP, self.EvtRightButton)
         self.lb2.SetSelection(0)


@@ -96,13 +96,16 @@ class TestListBox(wx.Panel):
                                    'test abcd' ]
         sampleList.sort()
         wx.StaticText(self, -1, "Find Prefix:", (15, 250))
                                    'test abcd' ]
         sampleList.sort()
         wx.StaticText(self, -1, "Find Prefix:", (15, 250))

-        fp = FindPrefixListBox(self, -1, (80, 250), (80, 120), sampleList, wx.LB_SINGLE)
+        fp = FindPrefixListBox(self, -1, (100, 250), (90, 120), sampleList, wx.LB_SINGLE)

         fp.SetSelection(0)
 
 
     def EvtListBox(self, event):
         fp.SetSelection(0)
 
 
     def EvtListBox(self, event):

-        self.log.WriteText('EvtListBox: %s, %s, %s\n' %
-                           (event.GetString(), event.IsSelection(), event.GetSelection()))
+        self.log.WriteText('EvtListBox: %s, %s, %s, %s\n' %
+                           (event.GetString(),
+                            event.IsSelection(),
+                            event.GetSelection(),
+                            event.GetClientData()))

 
         lb = event.GetEventObject()
         data = lb.GetClientData(lb.GetSelection())
 
         lb = event.GetEventObject()
         data = lb.GetClientData(lb.GetSelection())


@@ -154,5 +157,5 @@ independently of other selections).
 if __name__ == '__main__':
     import sys,os
     import run
 if __name__ == '__main__':
     import sys,os
     import run

-    run.main(['', os.path.basename(sys.argv[0])])
+    run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])