reverted wxPopupWindow implementation to the original version using WS_CHILD and desktop as parent; this fixes the activation problem but reopens the other ones
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -30,16 +30,6 @@ public:
|
||||
|
||||
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
|
||||
|
||||
// implementation only from now on
|
||||
// -------------------------------
|
||||
|
||||
// override Show() to prevent wxPopupWindow from being activated
|
||||
virtual bool Show(bool show = TRUE);
|
||||
|
||||
// find a shown popup window with the given window as parent, return NULL
|
||||
// if none
|
||||
static wxPopupWindow *FindPopupFor(wxWindow *win);
|
||||
|
||||
protected:
|
||||
// popups handle the position like wxTopLevelWindow, not wxWindow
|
||||
virtual void DoGetPosition(int *x, int *y) const;
|
||||
@@ -47,8 +37,8 @@ protected:
|
||||
// return the style to be used for the popup windows
|
||||
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const;
|
||||
|
||||
// the list of all currently shown popup windows used by FindPopupFor()
|
||||
static wxWindowList ms_shownPopups;
|
||||
// get the HWND to be used as parent of this window with CreateWindow()
|
||||
virtual WXHWND MSWGetParent() const;
|
||||
|
||||
DECLARE_DYNAMIC_CLASS(wxPopupWindow)
|
||||
};
|
||||
|
Reference in New Issue
Block a user