prevent IsDialogMessage() from hanging in yet another case

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 51243e639252b8a7d971b1b29c40bd30c974b57f..a6f3d3a4c17c56d6185844d3b6e7e16c295116d6 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2010,7 +2010,10 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
                       node;
                       node = node->GetNext() )
                 {
                       node;
                       node = node->GetNext() )
                 {

-                    if ( node->GetData()->AcceptsFocus() )
+                    wxWindow * const win = node->GetData();
+                    if ( win->AcceptsFocus() &&
+                            !(::GetWindowLong(GetHwndOf(win), GWL_EXSTYLE) &
+                                WS_EX_CONTROLPARENT) )

                     {
                         // it shouldn't hang...
                         canSafelyCallIsDlgMsg = TRUE;
                     {
                         // it shouldn't hang...
                         canSafelyCallIsDlgMsg = TRUE;


@@ -2019,7 +2022,7 @@ bool wxWindowMSW::MSWProcessMessage(WXMSG* pMsg)
                     }
                 }
             }
                     }
                 }
             }

-#endif
+#endif // !__WXWINCE__

 
             if ( canSafelyCallIsDlgMsg )
             {
 
             if ( canSafelyCallIsDlgMsg )
             {