Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make it possible to use controls inside wxComboPopup again

Browse Source 
This should have been done together with the changes of 41410610ef
(Don't force wxPU_CONTAINS_CONTROLS on wxPopupTransientWindow,
2020-07-10) as without this style controls inside wxComboPopup couldn't
accept focus any more, which broke the previously working code.
This commit is contained in:
Vadim Zeitlin
2020-12-04 19:54:13 +01:00
parent aa641b9aae
commit 63b1f17703
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/combocmn.cpp
View File

@@ -454,7 +454,8 @@ public:
wxComboPopupWindow( wxComboCtrlBase *parent, wxComboPopupWindow( wxComboCtrlBase *parent,
int style ) int style )
#if USES_WXPOPUPWINDOW || USES_WXPOPUPTRANSIENTWINDOW #if USES_WXPOPUPWINDOW || USES_WXPOPUPTRANSIENTWINDOW
: wxComboPopupWindowBase(parent,style) : wxComboPopupWindowBase(parent,
style | wxPU_CONTAINS_CONTROLS)
#else #else
: wxComboPopupWindowBase(parent, : wxComboPopupWindowBase(parent,
wxID_ANY, wxID_ANY,