Updated font dialog constructors to use a reference to the font data

[wxWidgets.git] / src / msw / window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 8ce7a97e2f6fea6e19daa16852015373292f89a6..b280a33098d47c35150332330f61e11ada4a571c 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2421,9 +2421,15 @@ long wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam
                         y = GET_Y_LPARAM(lParam);
 
                     // redirect the event to a static control if necessary
                         y = GET_Y_LPARAM(lParam);
 
                     // redirect the event to a static control if necessary

-                    wxWindow *win = FindWindowForMouseEvent(this, &x, &y);
-
-                    processed = win->HandleMouseEvent(message, x, y, wParam);
+                    if (this == GetCapture())
+                    {
+                        processed = HandleMouseEvent(message, x, y, wParam);
+                    }
+                    else
+                    {
+                        wxWindow *win = FindWindowForMouseEvent(this, &x, &y);
+                        processed = win->HandleMouseEvent(message, x, y, wParam);
+                    }

                 }
             }
             break;
                 }
             }
             break;