Fix for wxPopupWindows not being raised to the top by default
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@21185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -58,6 +58,10 @@
|
|||||||
#include "wx/dnd.h"
|
#include "wx/dnd.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if wxUSE_POPUPWIN
|
||||||
|
#include "wx/popupwin.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "wx/menuitem.h"
|
#include "wx/menuitem.h"
|
||||||
#include "wx/log.h"
|
#include "wx/log.h"
|
||||||
|
|
||||||
@@ -570,7 +574,11 @@ bool wxWindowMSW::Show(bool show)
|
|||||||
int cshow = show ? SW_SHOW : SW_HIDE;
|
int cshow = show ? SW_SHOW : SW_HIDE;
|
||||||
::ShowWindow(hWnd, cshow);
|
::ShowWindow(hWnd, cshow);
|
||||||
|
|
||||||
if ( show && IsTopLevel() )
|
if ( show && (IsTopLevel()
|
||||||
|
#if wxUSE_POPUPWIN
|
||||||
|
|| IsKindOf(CLASSINFO(wxPopupWindow)))
|
||||||
|
#endif
|
||||||
|
)
|
||||||
{
|
{
|
||||||
wxBringWindowToTop(hWnd);
|
wxBringWindowToTop(hWnd);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user