another merge from WX_2_6_BRANCH

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36730 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2006-01-06 07:05:15 +00:00
parent 2091f5e71a
commit 095315e20d
41 changed files with 3008 additions and 38638 deletions
--- a/wxPython/demo/Grid_MegaExample.py
+++ b/wxPython/demo/Grid_MegaExample.py
@@ -354,7 +354,7 @@ class MegaGrid(Grid.Grid):

        self.Bind(wx.EVT_MENU, append, id=appendID)
        self.Bind(wx.EVT_MENU, delete, id=deleteID)
-        self.PopupMenu(menu, (x, yo))
+        self.PopupMenu(menu)
        menu.Destroy()
        return

@@ -388,7 +388,7 @@ class MegaGrid(Grid.Grid):
        if len(cols) == 1:
            self.Bind(wx.EVT_MENU, sort, id=sortID)

-        self.PopupMenu(menu, (xo, 0))
+        self.PopupMenu(menu)
        menu.Destroy()
        return