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

Fix building with wxUSE_POPUP==0

Browse Source
This commit is contained in:
Maarten Bent 2020-06-01 15:56:41 +02:00
parent 5fa8280fd8
commit 379cff7d19
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/chkconf.h
View File

@ -2392,6 +2392,17 @@
# endif
#endif /* wxUSE_RICHTEXT */
#if wxUSE_RICHTOOLTIP
# if !wxUSE_POPUPWIN
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxRichToolTip requires wxUSE_POPUPWIN"
# else
# undef wxUSE_POPUPWIN
# define wxUSE_POPUPWIN 1
# endif
# endif
#endif /* wxUSE_RICHTOOLTIP */
#if wxUSE_PROPGRID
# if !wxUSE_VARIANT
# ifdef wxABORT_ON_CONFIG_ERROR

2
src/msw/window.cpp
View File

@ -3696,6 +3696,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
}
break;
#if wxUSE_POPUPWIN
case WM_NCACTIVATE:
// When we're losing activation to our own popup window, we want to
// retain the "active" appearance of the title bar, as dropping
@ -3712,6 +3713,7 @@ wxWindowMSW::MSWHandleMessage(WXLRESULT *result,
processed = true;
}
break;
#endif
#if wxUSE_UXTHEME
// If we want the default themed border then we need to draw it ourselves

4
src/stc/PlatWX.cpp
View File

@ -2161,7 +2161,7 @@ PRectangle Window::GetMonitorRect(Point pt) {
#ifdef __WXMSW__
// Use ShowWithoutActivating instead of show.
bool wxSTCPopupBase::Show(bool show) wxOVERRIDE
bool wxSTCPopupBase::Show(bool show)
{
if ( show )
{
@ -2179,7 +2179,7 @@ PRectangle Window::GetMonitorRect(Point pt) {
// Do not activate in response to mouse clicks on this window.
bool wxSTCPopupBase::MSWHandleMessage(WXLRESULT *res, WXUINT msg,
WXWPARAM wParam, WXLPARAM lParam) wxOVERRIDE
WXWPARAM wParam, WXLPARAM lParam)
{
if ( msg == WM_MOUSEACTIVATE )
{