From b3f8a6390f18a5626a027839ea352580edc9c67f Mon Sep 17 00:00:00 2001 From: Susan Farley Date: Sat, 8 Jul 2000 18:28:25 +0000 Subject: [PATCH] Check for WS_DISABLED parent in WindowFromPoint for un-managed windows. --- windows/winpos.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/windows/winpos.c b/windows/winpos.c index 45b335f062e..121f650ceab 100644 --- a/windows/winpos.c +++ b/windows/winpos.c @@ -403,17 +403,18 @@ INT16 WINPOS_WindowFromPoint( WND* wndScope, POINT16 pt, WND **ppWnd ) *ppWnd = NULL; wndPtr = WIN_LockWndPtr(wndScope->child); + + if( wndScope->dwStyle & WS_DISABLED ) + { + retvalue = HTERROR; + goto end; + } if( wndScope->flags & WIN_MANAGED ) { /* In managed mode we have to check wndScope first as it is also * a window which received the mouse event. */ - if( wndScope->dwStyle & WS_DISABLED ) - { - retvalue = HTERROR; - goto end; - } if( pt.x < wndScope->rectClient.left || pt.x >= wndScope->rectClient.right || pt.y < wndScope->rectClient.top || pt.y >= wndScope->rectClient.bottom ) goto hittest; -- 2.11.4.GIT