Merged modifications from the 2.6 branch

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36607 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2005-12-30 23:02:03 +00:00
parent a780a8dc19
commit 02b800ce7c
104 changed files with 14102 additions and 46560 deletions
--- a/wxPython/demo/HyperLinkCtrl.py
+++ b/wxPython/demo/HyperLinkCtrl.py
@@ -89,7 +89,7 @@ class TestPanel(wx.Panel):
        
        
    def OnRightLink(self, event):
-        pos = event.GetPosition()
+        pos = self._hyper3.GetPosition() + event.GetPosition()
        menuPopUp = wx.Menu("Having a nice day?")
        ID_MENU_YES = wx.NewId()
        ID_MENU_NO  = wx.NewId()