wxPopupWindow::GetPosition() should return point in screen coords now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12409 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index 3586d958bb8a412762d2bbf7e24bd0584e60ed0d..14105ab8551a6de539345520b007678538478b7c 100644 (file)
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -31,6 +31,17 @@ public:
                                 wxDefaultPosition, wxDefaultSize,
                                 (flags & wxBORDER_MASK) | wxPOPUP_WINDOW);
     }
                                 wxDefaultPosition, wxDefaultSize,
                                 (flags & wxBORDER_MASK) | wxPOPUP_WINDOW);
     }

+
+protected:
+    virtual void DoGetPosition(int *x, int *y) const
+    {
+        // the position of a "top level" window such as this should be in
+        // screen coordinates, not in the client ones which MSW gives us
+        // (because we are a child window)
+        wxPopupWindowBase::DoGetPosition(x, y);
+
+        GetParent()->DoClientToScreen(x, y);
+    }

 };
 
 #endif // _WX_MSW_POPUPWIN_H_
 };
 
 #endif // _WX_MSW_POPUPWIN_H_