Added corrected Show() to wxPopupWindow
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21197 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -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;
|
||||
|
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user