X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b881fc787d2823bdd8a415080b82feee90804a17..207ddcc9882758f7f8e4fcfb3ad39e5d284f6190:/wxPython/demo/PopupMenu.py diff --git a/wxPython/demo/PopupMenu.py b/wxPython/demo/PopupMenu.py index 9dd5435b2d..837e9c27d4 100644 --- a/wxPython/demo/PopupMenu.py +++ b/wxPython/demo/PopupMenu.py @@ -1,6 +1,3 @@ -# 11/13/2003 - Jeff Grimmett (grimmtooth@softhome.net) -# -# o Updated for wx namespace import wx @@ -34,8 +31,6 @@ class TestPanel(wx.Panel): t = wx.StaticText(self, -1, "PopupMenu") t.SetFont(bf) box.Add(t, 0, wx.CENTER|wx.ALL, 5) - self.Bind(wx.EVT_RIGHT_UP, self.OnRightClick) - box.Add(wx.StaticLine(self, -1), 0, wx.EXPAND) box.Add((10,20)) @@ -43,14 +38,15 @@ class TestPanel(wx.Panel): t = wx.StaticText(self, -1, text) t.SetFont(nf) box.Add(t, 0, wx.CENTER|wx.ALL, 5) + t.Bind(wx.EVT_CONTEXT_MENU, self.OnContextMenu) self.SetSizer(box) - self.Bind(wx.EVT_RIGHT_UP, self.OnRightClick) + self.Bind(wx.EVT_CONTEXT_MENU, self.OnContextMenu) - def OnRightClick(self, event): - self.log.WriteText("OnRightClick\n") + def OnContextMenu(self, event): + self.log.WriteText("OnContextMenu\n") # only do this part the first time so the events are only bound once # @@ -82,7 +78,8 @@ class TestPanel(wx.Panel): menu = wx.Menu() # Show how to put an icon in the menu item = wx.MenuItem(menu, self.popupID1,"One") - item.SetBitmap(images.getSmilesBitmap()) + bmp = images.getSmilesBitmap() + item.SetBitmap(bmp) menu.AppendItem(item) # add some other items menu.Append(self.popupID2, "Two") @@ -99,7 +96,7 @@ class TestPanel(wx.Panel): # Popup the menu. If an item is selected then its handler # will be called before PopupMenu returns. - self.PopupMenu(menu, event.GetPosition()) + self.PopupMenu(menu) menu.Destroy() @@ -155,5 +152,5 @@ overview = """ if __name__ == '__main__': import sys,os import run - run.main(['', os.path.basename(sys.argv[0])]) + run.main(['', os.path.basename(sys.argv[0])] + sys.argv[1:])