X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c368d904fc27d35ae1e533155e2154dc496432e4..6618870d16515551b6d00956fbadabddbde5293a:/wxPython/demo/wxListCtrl.py

diff --git a/wxPython/demo/wxListCtrl.py b/wxPython/demo/wxListCtrl.py
index 6ac4ede2ba..6f10f7d7a9 100644
--- a/wxPython/demo/wxListCtrl.py
+++ b/wxPython/demo/wxListCtrl.py
@@ -57,6 +57,7 @@ musicdata = {
 39: ("Yes", "Rhythm Of Love", "Rock"),
 }
 
+import images
 
 class TestListCtrlPanel(wxPanel):
     def __init__(self, parent, log):
@@ -66,14 +67,15 @@ class TestListCtrlPanel(wxPanel):
         tID = wxNewId()
 
         self.il = wxImageList(16, 16)
-        idx1 = self.il.Add(wxBitmap('bitmaps/smiles.bmp', wxBITMAP_TYPE_BMP))
+        bmp = images.getSmilesBitmap()
+        idx1 = self.il.AddWithColourMask(bmp, wxWHITE)
 
         self.list = wxListCtrl(self, tID,
                                style=wxLC_REPORT|wxSUNKEN_BORDER)
         self.list.SetImageList(self.il, wxIMAGE_LIST_SMALL)
 
+        #  Why doesn't this show up on MSW???
         self.list.SetToolTip(wxToolTip("This is a ToolTip!"))
-        wxToolTip_Enable(true)
 
         self.list.InsertColumn(0, "Artist")
         self.list.InsertColumn(1, "Title", wxLIST_FORMAT_RIGHT)
@@ -122,9 +124,19 @@ class TestListCtrlPanel(wxPanel):
         self.log.WriteText("x, y = %s\n" % str((self.x, self.y)))
         event.Skip()
 
+
+    def getColumnText(self, index, col):
+        item = self.list.GetItem(index, col)
+        return item.GetText()
+
+
     def OnItemSelected(self, event):
         self.currentItem = event.m_itemIndex
-        self.log.WriteText("OnItemSelected: %s\n" % self.list.GetItemText(self.currentItem))
+        self.log.WriteText("OnItemSelected: %s, %s, %s\n" %
+                           (self.list.GetItemText(self.currentItem),
+                            self.getColumnText(self.currentItem, 1),
+                            self.getColumnText(self.currentItem, 2)))
+
 
     def OnItemActivated(self, event):
         self.currentItem = event.m_itemIndex
@@ -148,7 +160,7 @@ class TestListCtrlPanel(wxPanel):
 
     def OnDoubleClick(self, event):
         self.log.WriteText("OnDoubleClick item %s\n" % self.list.GetItemText(self.currentItem))
-
+        event.Skip()
 
     def OnRightClick(self, event):
         self.log.WriteText("OnRightClick %s\n" % self.list.GetItemText(self.currentItem))
@@ -170,6 +182,7 @@ class TestListCtrlPanel(wxPanel):
         EVT_MENU(self, tPopupID5, self.OnPopupFive)
         self.PopupMenu(menu, wxPoint(self.x, self.y))
         menu.Destroy()
+        event.Skip()
 
     def OnPopupOne(self, event):
         self.log.WriteText("Popup one\n")