From d1c80692613d2682c89b3b67f139a2f1bd044ece Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 2 Jul 2001 13:45:53 +0000 Subject: [PATCH] process WM_ACTIVATEAPP in wxMSW too, not only wxUniv git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10784 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/window.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/msw/window.cpp b/src/msw/window.cpp index 5994bed1f7..b3f8c31882 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -2076,22 +2076,10 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam } break; -#if defined(__WXUNIVERSAL__) && !defined(__WXMICROWIN__) case WM_ACTIVATEAPP: wxTheApp->SetActive(wParam != 0, FindFocus()); break; - case WM_NCHITTEST: - // we shouldn't allow the windows which don't want to get focus to - // get it - if ( !AcceptsFocus() ) - { - rc.result = HTTRANSPARENT; - processed = TRUE; - } - break; -#endif // __WXUNIVERSAL__ - case WM_ACTIVATE: { WXWORD state, minimized; @@ -2463,6 +2451,18 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam } break; #endif // __WIN32__ + +#ifdef __WXUNIVERSAL__ + case WM_NCHITTEST: + // we shouldn't allow the windows which don't want to get focus to + // get it + if ( !AcceptsFocus() ) + { + rc.result = HTTRANSPARENT; + processed = TRUE; + } + break; +#endif // __WXUNIVERSAL__ } if ( !processed ) -- 2.47.2