New typemaps for wxString when compiling for Python 2.0 and beyond

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

diff --git a/wxPython/demo/wxListCtrl.py b/wxPython/demo/wxListCtrl.py
index 6ac4ede2ba47cfc76c4ec582ffd402234498303c..7d915f6cf729982b522271f31ecc7a173779ce56 100644 (file)
--- a/wxPython/demo/wxListCtrl.py
+++ b/wxPython/demo/wxListCtrl.py
@@ -66,14 +66,15 @@ class TestListCtrlPanel(wxPanel):
         tID = wxNewId()
 
         self.il = wxImageList(16, 16)
         tID = wxNewId()
 
         self.il = wxImageList(16, 16)

-        idx1 = self.il.Add(wxBitmap('bitmaps/smiles.bmp', wxBITMAP_TYPE_BMP))
+        bmp = wxBitmap('bitmaps/smiles.bmp', wxBITMAP_TYPE_BMP)
+        idx1 = self.il.AddWithColourMask(bmp, wxWHITE)

 
         self.list = wxListCtrl(self, tID,
                                style=wxLC_REPORT|wxSUNKEN_BORDER)
         self.list.SetImageList(self.il, wxIMAGE_LIST_SMALL)
 
 
         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!"))
         self.list.SetToolTip(wxToolTip("This is a ToolTip!"))

-        wxToolTip_Enable(true)

 
         self.list.InsertColumn(0, "Artist")
         self.list.InsertColumn(1, "Title", wxLIST_FORMAT_RIGHT)
 
         self.list.InsertColumn(0, "Artist")
         self.list.InsertColumn(1, "Title", wxLIST_FORMAT_RIGHT)


@@ -122,9 +123,19 @@ class TestListCtrlPanel(wxPanel):
         self.log.WriteText("x, y = %s\n" % str((self.x, self.y)))
         event.Skip()
 
         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
     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
 
     def OnItemActivated(self, event):
         self.currentItem = event.m_itemIndex


@@ -148,7 +159,7 @@ class TestListCtrlPanel(wxPanel):
 
     def OnDoubleClick(self, event):
         self.log.WriteText("OnDoubleClick item %s\n" % self.list.GetItemText(self.currentItem))
 
     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))
 
     def OnRightClick(self, event):
         self.log.WriteText("OnRightClick %s\n" % self.list.GetItemText(self.currentItem))


@@ -170,6 +181,7 @@ class TestListCtrlPanel(wxPanel):
         EVT_MENU(self, tPopupID5, self.OnPopupFive)
         self.PopupMenu(menu, wxPoint(self.x, self.y))
         menu.Destroy()
         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")
 
     def OnPopupOne(self, event):
         self.log.WriteText("Popup one\n")