X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a08cbc01686c6acf8260a230ccdae38290dbfd20..26b9cf270e57348e6fadf1e05a4a097ddb3615a4:/utils/wxPython/demo/wxListCtrl.py?ds=sidebyside

diff --git a/utils/wxPython/demo/wxListCtrl.py b/utils/wxPython/demo/wxListCtrl.py
index df3a9f53d2..bd8487818c 100644
--- a/utils/wxPython/demo/wxListCtrl.py
+++ b/utils/wxPython/demo/wxListCtrl.py
@@ -23,7 +23,7 @@ class TestListCtrlPanel(wxPanel):
         tID = NewId()
 
         self.il = wxImageList(16, 16)
-        idx1 = self.il.Add(wxNoRefBitmap('bitmaps/smiles.bmp', wxBITMAP_TYPE_BMP))
+        idx1 = self.il.Add(wxBitmap('bitmaps/smiles.bmp', wxBITMAP_TYPE_BMP))
 
         self.list = wxListCtrl(self, tID, wxDefaultPosition, wxDefaultSize,
                                wxLC_REPORT|wxSUNKEN_BORDER)
@@ -39,6 +39,7 @@ class TestListCtrlPanel(wxPanel):
             self.list.InsertImageStringItem(x, "This is item %d" % x, idx1)
             self.list.SetStringItem(x, 1, "Col 1, item %d" % x)
             self.list.SetStringItem(x, 2, "item %d in column 2" % x)
+            self.list.SetItemData(x, x*2)
 
         self.list.SetColumnWidth(0, wxLIST_AUTOSIZE)
         self.list.SetColumnWidth(1, wxLIST_AUTOSIZE)
@@ -48,38 +49,55 @@ class TestListCtrlPanel(wxPanel):
 
         self.currentItem = 0
         EVT_LIST_ITEM_SELECTED(self, tID, self.OnItemSelected)
+        EVT_LIST_DELETE_ITEM(self, tID, self.OnItemDelete)
         EVT_LEFT_DCLICK(self.list, self.OnDoubleClick)
-        EVT_COMMAND_RIGHT_CLICK(self.list, tID, self.OnRightClick)
         EVT_RIGHT_DOWN(self.list, self.OnRightDown)
 
+        # for wxMSW
+        EVT_COMMAND_RIGHT_CLICK(self.list, tID, self.OnRightClick)
+
+        # for wxGTK
+        EVT_RIGHT_UP(self.list, self.OnRightClick)
+
 
     def OnRightDown(self, event):
         self.x = event.GetX()
-        self.log.WriteText("x = %d\n" % self.x)
+        self.y = event.GetY()
+        self.log.WriteText("x, y = %s\n" % str((self.x, self.y)))
         event.Skip()
 
     def OnItemSelected(self, event):
         self.currentItem = event.m_itemIndex
         self.log.WriteText("OnItemSelected: %s\n" % self.list.GetItemText(self.currentItem))
 
+    def OnItemDelete(self, event):
+        self.log.WriteText("OnItemDelete\n")
+
+
     def OnDoubleClick(self, event):
         self.log.WriteText("OnDoubleClick item %s\n" % self.list.GetItemText(self.currentItem))
 
 
     def OnRightClick(self, event):
         self.log.WriteText("OnRightClick %s\n" % self.list.GetItemText(self.currentItem))
-        menu = wxPyMenu()
+        menu = wxMenu()
         tPopupID1 = 0
         tPopupID2 = 1
         tPopupID3 = 2
+        tPopupID4 = 3
+        tPopupID5 = 5
         menu.Append(tPopupID1, "One")
         menu.Append(tPopupID2, "Two")
         menu.Append(tPopupID3, "Three")
+        menu.Append(tPopupID4, "DeleteAllItems")
+        menu.Append(tPopupID5, "GetItem")
         EVT_MENU(self, tPopupID1, self.OnPopupOne)
         EVT_MENU(self, tPopupID2, self.OnPopupTwo)
         EVT_MENU(self, tPopupID3, self.OnPopupThree)
-        pos = self.list.GetItemPosition(self.currentItem)
-        self.PopupMenu(menu, self.x, pos.y)
+        EVT_MENU(self, tPopupID4, self.OnPopupFour)
+        EVT_MENU(self, tPopupID5, self.OnPopupFive)
+        self.PopupMenu(menu, wxPoint(self.x, self.y))
+        menu.Destroy()
 
     def OnPopupOne(self, event):
         self.log.WriteText("Popup one\n")
@@ -90,6 +108,13 @@ class TestListCtrlPanel(wxPanel):
     def OnPopupThree(self, event):
         self.log.WriteText("Popup three\n")
 
+    def OnPopupFour(self, event):
+        self.list.DeleteAllItems()
+
+    def OnPopupFive(self, event):
+        item = self.list.GetItem(self.currentItem)
+        print item.m_text, item.m_itemId, self.list.GetItemData(self.currentItem)
+
     def OnSize(self, event):
         w,h = self.GetClientSizeTuple()
         self.list.SetDimensions(0, 0, w, h)