In GetPath(), don't append separator if there's already one at the end

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

diff --git a/wxPython/demo/wxCheckListBox.py b/wxPython/demo/wxCheckListBox.py
index 39f3d006bda2cc3080354909b0f5f809692beaf4..4a0fd024c7376d57c79df98457dcf87e2c6c42b5 100644 (file)
--- a/wxPython/demo/wxCheckListBox.py
+++ b/wxPython/demo/wxCheckListBox.py
@@ -13,13 +13,17 @@ class TestPanel(wxPanel):
                       'twelve', 'thirteen', 'fourteen']
 
         wxStaticText(self, -1, "This example uses the wxCheckListBox control.",
-                               wxPoint(45, 15))
+                               (45, 15))
 
-        lb = wxCheckListBox(self, 60, wxPoint(80, 50), wxSize(80, 120),
+        lb = wxCheckListBox(self, 60, (80, 50), (80, 120),
                             sampleList)
         EVT_LISTBOX(self, 60, self.EvtListBox)
         EVT_LISTBOX_DCLICK(self, 60, self.EvtListBoxDClick)
         lb.SetSelection(0)
+        self.lb = lb
+
+        btn = wxButton(self, -1, "Test SetString", (180, 50))
+        EVT_BUTTON(self, btn.GetId(), self.OnTestButton)
 
         EVT_RIGHT_UP(self, self.OnDoPopup)
 
@@ -30,20 +34,24 @@ class TestPanel(wxPanel):
     def EvtListBoxDClick(self, event):
         self.log.WriteText('EvtListBoxDClick:\n')
 
+    def OnTestButton(self, evt):
+        self.lb.SetString(4, "FUBAR")
+
+
     def OnDoPopup(self, evt):
         menu = wxMenu()
         # Make this first item bold
-        item = wxMenuItem(menu, 101, "If supported, this is &bold")
+        item = wxMenuItem(menu, wxNewId(), "If supported, this is bold")
         df = wxSystemSettings_GetSystemFont(wxSYS_DEFAULT_GUI_FONT)
         nf = wxFont(df.GetPointSize(), df.GetFamily(), df.GetStyle(), wxBOLD,
                     false, df.GetFaceName())
         item.SetFont(nf)
         menu.AppendItem(item)
 
-        menu.AppendItem(wxMenuItem(menu, 102, "Normal Item &1"))
-        menu.AppendItem(wxMenuItem(menu, 103, "Normal Item &2"))
-        menu.AppendItem(wxMenuItem(menu, 104, "Normal Item &3"))
-        menu.AppendItem(wxMenuItem(menu, 105, "Normal Item &4"))
+        menu.AppendItem(wxMenuItem(menu, wxNewId(), "Normal Item &1"))
+        menu.AppendItem(wxMenuItem(menu, wxNewId(), "Normal Item &2"))
+        menu.AppendItem(wxMenuItem(menu, wxNewId(), "Normal Item &3"))
+        menu.AppendItem(wxMenuItem(menu, wxNewId(), "Normal Item &4"))
 
         self.PopupMenu(menu, evt.GetPosition())
         menu.Destroy()