From 3a5ce237deff82b888eca9502a0b5758e3c502bd Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 7 Mar 2013 05:22:27 +0000 Subject: [PATCH] Fix wx.FindWindowAtPointer wrapper to return the point parameter in addition to the window git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@73613 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- etg/window.py | 3 ++- wx/lib/inspection.py | 2 +- wx/lib/mixins/inspection.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/etg/window.py b/etg/window.py index 27ef69b7..972ef534 100644 --- a/etg/window.py +++ b/etg/window.py @@ -308,7 +308,8 @@ def run(): module.addPyCode("PyWindow = wx.deprecated(Window, 'Use Window instead.')") - + module.find('wxFindWindowAtPointer.pt').out = True + module.addCppFunction('wxWindow*', 'FindWindowById', '(long id, const wxWindow* parent=NULL)', doc="""\ diff --git a/wx/lib/inspection.py b/wx/lib/inspection.py index 5a8f8d28..a6fb0ea2 100644 --- a/wx/lib/inspection.py +++ b/wx/lib/inspection.py @@ -315,7 +315,7 @@ class InspectionFrame(wx.Frame): def OnLeftDown(self, evt): self.ReleaseMouse() - wnd = wx.FindWindowAtPointer() + wnd, pt = wx.FindWindowAtPointer() if wnd is not None: self.SetObj(wnd) else: diff --git a/wx/lib/mixins/inspection.py b/wx/lib/mixins/inspection.py index 0a5c377b..94865091 100644 --- a/wx/lib/mixins/inspection.py +++ b/wx/lib/mixins/inspection.py @@ -70,7 +70,7 @@ class InspectionMixin(object): to display the widget under the cursor. """ # get the current widget under the mouse - wnd = wx.FindWindowAtPointer() + wnd, pt = wx.FindWindowAtPointer() InspectionTool().Show(wnd)