Added corrected Show() to wxPopupWindow

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

diff --git a/include/wx/msw/popupwin.h b/include/wx/msw/popupwin.h
index ae220bc388d4e14090b603261c06cef4b9537e35..1dffaa67ee8d2d433306cade0f181ab8f122a8a2 100644 (file)
--- a/include/wx/msw/popupwin.h
+++ b/include/wx/msw/popupwin.h
@@ -30,6 +30,8 @@ public:
 
     bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
 
+    virtual bool Show(bool show = TRUE);
+
 protected:
     // popups handle the position like wxTopLevelWindow, not wxWindow
     virtual void DoGetPosition(int *x, int *y) const;

diff --git a/src/msw/popupwin.cpp b/src/msw/popupwin.cpp
index 7e44f08a0e3b2798e3795d8e1ae98e96d4e370c5..6cddce9ae3b565234e353b67e143068bc337d14e 100644 (file)
--- a/src/msw/popupwin.cpp
+++ b/src/msw/popupwin.cpp
@@ -87,4 +87,26 @@ WXHWND wxPopupWindow::MSWGetParent() const
     return (WXHWND)::GetDesktopWindow();
 }
 
+bool wxPopupWindow::Show(bool show)
+{
+    if ( !wxWindowBase::Show(show) )
+        return FALSE;
+
+    HWND hWnd = GetHwnd();
+    int cshow = show ? SW_SHOW : SW_HIDE;
+    ::ShowWindow(hWnd, cshow);
+
+    if ( show )
+    {
+        // raise to top of z order
+        if (!::SetWindowPos(hWnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE))
+        {
+            wxLogLastError(_T("SetWindowPos"));
+        }
+    }
+
+    return TRUE;
+}
+
 #endif // #if wxUSE_POPUPWIN
+