fixed bug with the caret positioning after SetValue() introduced by the last commit

[wxWidgets.git] / include / wx / msw / popupwin.h

diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index 616b22679df22b5e901962aaf029d7b39da95c2a..297c0e799164644f52938dac8bfe0232e5e307d9 100644 (file)
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -21,7 +21,8 @@ class WXDLLEXPORT wxPopupWindow : public wxPopupWindowBase
 public:
     wxPopupWindow() { }
 
 public:
     wxPopupWindow() { }
 

-    wxPopupWindow(wxWindow *parent) { (void)Create(parent); }
+    wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
+        { (void)Create(parent, flags); }

 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE)
     {
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE)
     {


@@ -30,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()->ClientToScreen(x, y);
+    }

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