Allow wx parents a chance to handle events fired by non-wx children. (i.e. wxActiveX...

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

diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 54ac1c55cd8ca13371e600d1223a0e46221b9069..7721d45905085d4f4ea45f177791ce805d25692b 100644 (file)
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -124,23 +124,35 @@ bool wxEventLoop::IsChildOfCriticalWindow(wxWindowMSW *win)
 bool wxEventLoop::PreProcessMessage(WXMSG *msg)
 {
     HWND hwnd = msg->hwnd;
 bool wxEventLoop::PreProcessMessage(WXMSG *msg)
 {
     HWND hwnd = msg->hwnd;

-    wxWindow * const wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
+    wxWindow *wndThis = wxGetWindowFromHWND((WXHWND)hwnd);

     wxWindow *wnd;
 
     wxWindow *wnd;
 

-    // this may happen if the event occurred in a standard modeless dialog (the
-    // only example of which I know of is the find/replace dialog) - then call
-    // IsDialogMessage() to make TAB navigation in it work
+       wxWindow* parent = NULL;
+
+       // this might happen if we're in a modeless dialog, or if a wx control has
+       // children which themselves were not created by wx (i.e. wxActiveX control children)

     if ( !wndThis )
     {
     if ( !wndThis )
     {

-        // we need to find the dialog containing this control as
-        // IsDialogMessage() just eats all the messages (i.e. returns true for
-        // them) if we call it for the control itself

         while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
         {
             hwnd = ::GetParent(hwnd);
         while ( hwnd && ::GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD )
         {
             hwnd = ::GetParent(hwnd);

+
+                       // If the control has a wx parent, break and give the parent a chance
+                       // to process the window message
+                       wndThis = wxGetWindowFromHWND((WXHWND)hwnd);
+                       if (wndThis != NULL)
+                               break;

         }
 
         }
 

-        return hwnd && ::IsDialogMessage(hwnd, msg) != 0;
+               if ( !wndThis ){
+                       // this may happen if the event occurred in a standard modeless dialog (the
+                       // only example of which I know of is the find/replace dialog) - then call
+                       // IsDialogMessage() to make TAB navigation in it work
+                       
+                       // NOTE: IsDialogMessage() just eats all the messages (i.e. returns true for
+                       // them) if we call it for the control itself
+                       return hwnd && ::IsDialogMessage(hwnd, msg) != 0;
+               }

     }
 
     if ( !AllowProcessing(wndThis) )
     }
 
     if ( !AllowProcessing(wndThis) )