07f64c3b75
This restores the default behavior of a popup window in MSW to the
behavior it had before 56c4191168. The new
flag added by this commit can be used to give the popup window the
behavior from after that commit, i.e. choose the implementation using a
WS_POPUP window rather than the default one using a WS_CHILD of the
desktop.
The old behavior kept the popup from taking focus from its parent window
but left some controls not working. The new behavior has the popup take
focus and lets all controls work.
Closes https://github.com/wxWidgets/wxWidgets/pull/1123
50 lines
1.5 KiB
C++
50 lines
1.5 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/msw/popupwin.h
|
|
// Purpose: wxPopupWindow class for wxMSW
|
|
// Author: Vadim Zeitlin
|
|
// Modified by:
|
|
// Created: 06.01.01
|
|
// Copyright: (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_MSW_POPUPWIN_H_
|
|
#define _WX_MSW_POPUPWIN_H_
|
|
|
|
// ----------------------------------------------------------------------------
|
|
// wxPopupWindow
|
|
// ----------------------------------------------------------------------------
|
|
|
|
class WXDLLIMPEXP_CORE wxPopupWindow : public wxPopupWindowBase
|
|
{
|
|
public:
|
|
wxPopupWindow() { m_owner = NULL; }
|
|
|
|
wxPopupWindow(wxWindow *parent, int flags = wxBORDER_NONE)
|
|
{ (void)Create(parent, flags); }
|
|
|
|
bool Create(wxWindow *parent, int flags = wxBORDER_NONE);
|
|
|
|
virtual void SetFocus() wxOVERRIDE;
|
|
virtual bool Show(bool show = true) wxOVERRIDE;
|
|
|
|
// return the style to be used for the popup windows
|
|
virtual WXDWORD MSWGetStyle(long flags, WXDWORD *exstyle) const wxOVERRIDE;
|
|
|
|
// get the HWND to be used as parent of this window with CreateWindow()
|
|
virtual WXHWND MSWGetParent() const wxOVERRIDE;
|
|
|
|
|
|
// Implementation only from now on.
|
|
|
|
// Return the top level window parent of this popup or null.
|
|
wxWindow* MSWGetOwner() const { return m_owner; }
|
|
|
|
private:
|
|
wxWindow* m_owner;
|
|
|
|
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxPopupWindow);
|
|
};
|
|
|
|
#endif // _WX_MSW_POPUPWIN_H_
|