minor clean up

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

diff --git a/wxPython/demo/wxListCtrl.py b/wxPython/demo/wxListCtrl.py
index 6f10f7d7a9ccbe2f8e6efdffb19b1ad00bd02fb9..86d9c01ce2d3c38aa63bb7ebe162b3299bf4c3a1 100644 (file)
--- a/wxPython/demo/wxListCtrl.py
+++ b/wxPython/demo/wxListCtrl.py
@@ -68,10 +68,11 @@ class TestListCtrlPanel(wxPanel):
 
         self.il = wxImageList(16, 16)
         bmp = images.getSmilesBitmap()
 
         self.il = wxImageList(16, 16)
         bmp = images.getSmilesBitmap()

-        idx1 = self.il.AddWithColourMask(bmp, wxWHITE)
+        #idx1 = self.il.AddWithColourMask(bmp, wxWHITE)
+        idx1 = self.il.Add(bmp)

 
         self.list = wxListCtrl(self, tID,
 
         self.list = wxListCtrl(self, tID,

-                               style=wxLC_REPORT|wxSUNKEN_BORDER)
+                               style=wxLC_REPORT|wxSUNKEN_BORDER)#|wxLC_VRULES|wxLC_HRULES)

         self.list.SetImageList(self.il, wxIMAGE_LIST_SMALL)
 
         #  Why doesn't this show up on MSW???
         self.list.SetImageList(self.il, wxIMAGE_LIST_SMALL)
 
         #  Why doesn't this show up on MSW???


@@ -92,7 +93,7 @@ class TestListCtrlPanel(wxPanel):
         self.list.SetColumnWidth(1, wxLIST_AUTOSIZE)
         ##self.list.SetColumnWidth(2, wxLIST_AUTOSIZE)
 
         self.list.SetColumnWidth(1, wxLIST_AUTOSIZE)
         ##self.list.SetColumnWidth(2, wxLIST_AUTOSIZE)
 

-        self.list.SetItemState(25, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED)
+        self.list.SetItemState(5, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED)

 
         #self.list.SetItemState(25, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED)
         #self.list.EnsureVisible(25)
 
         #self.list.SetItemState(25, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED)
         #self.list.EnsureVisible(25)


@@ -102,6 +103,10 @@ class TestListCtrlPanel(wxPanel):
         item.SetTextColour(wxBLUE)
         self.list.SetItem(item)
 
         item.SetTextColour(wxBLUE)
         self.list.SetItem(item)
 

+        item = self.list.GetItem(4)
+        item.SetTextColour(wxRED)
+        self.list.SetItem(item)
+

         self.currentItem = 0
         EVT_SIZE(self, self.OnSize)
         EVT_LIST_ITEM_SELECTED(self, tID, self.OnItemSelected)
         self.currentItem = 0
         EVT_SIZE(self, self.OnSize)
         EVT_LIST_ITEM_SELECTED(self, tID, self.OnItemSelected)


@@ -132,11 +137,16 @@ class TestListCtrlPanel(wxPanel):
 
     def OnItemSelected(self, event):
         self.currentItem = event.m_itemIndex
 
     def OnItemSelected(self, event):
         self.currentItem = event.m_itemIndex

-        self.log.WriteText("OnItemSelected: %s, %s, %s\n" %
-                           (self.list.GetItemText(self.currentItem),
+        self.log.WriteText("OnItemSelected: %s, %s, %s, %s\n" %
+                           (self.currentItem,
+                            self.list.GetItemText(self.currentItem),

                             self.getColumnText(self.currentItem, 1),
                             self.getColumnText(self.currentItem, 2)))
                             self.getColumnText(self.currentItem, 1),
                             self.getColumnText(self.currentItem, 2)))

-
+        if self.currentItem == 10:
+            self.log.WriteText("OnItemSelected: Veto'd selection\n")
+            #event.Veto()  # doesn't work
+            # this does
+            self.list.SetItemState(10, 0, wxLIST_STATE_SELECTED)

 
     def OnItemActivated(self, event):
         self.currentItem = event.m_itemIndex
 
     def OnItemActivated(self, event):
         self.currentItem = event.m_itemIndex


@@ -153,7 +163,9 @@ class TestListCtrlPanel(wxPanel):
     def ColumnSorter(self, key1, key2):
         item1 = musicdata[key1][self.col]
         item2 = musicdata[key2][self.col]
     def ColumnSorter(self, key1, key2):
         item1 = musicdata[key1][self.col]
         item2 = musicdata[key2][self.col]

-        if item1 == item2:  return 0
+
+        # when the items are identical, compare someting else to make the sort key unique...
+        if item1 == item2:  return key1 - key2

         elif item1 < item2: return -1
         else:               return 1
 
         elif item1 < item2: return -1
         else:               return 1
 


@@ -170,7 +182,10 @@ class TestListCtrlPanel(wxPanel):
         tPopupID3 = 2
         tPopupID4 = 3
         tPopupID5 = 5
         tPopupID3 = 2
         tPopupID4 = 3
         tPopupID5 = 5

-        menu.Append(tPopupID1, "One")
+        #menu.Append(tPopupID1, "One")
+        item = wxMenuItem(menu, tPopupID1,"One")
+        item.SetBitmap(images.getSmilesBitmap())
+        menu.AppendItem(item)

         menu.Append(tPopupID2, "Two")
         menu.Append(tPopupID3, "Three")
         menu.Append(tPopupID4, "DeleteAllItems")
         menu.Append(tPopupID2, "Two")
         menu.Append(tPopupID3, "Three")
         menu.Append(tPopupID4, "DeleteAllItems")


@@ -235,29 +250,4 @@ def runTest(frame, nb, log):
 overview = """\
 A list control presents lists in a number of formats: list view, report view, icon view and small icon view. Elements are numbered from zero.
 
 overview = """\
 A list control presents lists in a number of formats: list view, report view, icon view and small icon view. Elements are numbered from zero.
 

-wxListCtrl()
-------------------------
-
-Default constructor.
-
-wxListCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxLC_ICON, const wxValidator& validator = wxDefaultValidator, const wxString& name = "listCtrl")
-
-Constructor, creating and showing a list control.
-
-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.
-
-style = Window style. See wxListCtrl.
-
-validator = Window validator.
-
-name = Window name.

 """
 """