don't activate disabled windows

svn path=/trunk/; revision=7886
This commit is contained in:
Thomas Bluemel 2004-01-27 08:49:58 +00:00
parent 71270ddbba
commit 420710cf61
2 changed files with 11 additions and 4 deletions

View file

@ -15,7 +15,7 @@ IntGetFocusWindow();
HWND FASTCALL
IntGetThreadFocusWindow();
VOID FASTCALL
BOOL FASTCALL
IntMouseActivateWindow(PWINDOW_OBJECT Window);
BOOL FASTCALL
IntSetForegroundWindow(PWINDOW_OBJECT Window);

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Id: focus.c,v 1.13 2004/01/17 15:18:25 navaraf Exp $
* $Id: focus.c,v 1.14 2004/01/27 08:49:58 weiden Exp $
*/
#include <win32k/win32k.h>
@ -175,12 +175,18 @@ IntSetForegroundWindow(PWINDOW_OBJECT Window)
return IntSetForegroundAndFocusWindow(Window, Window, FALSE);
}
VOID FASTCALL
BOOL FASTCALL
IntMouseActivateWindow(PWINDOW_OBJECT Window)
{
HWND Top;
PWINDOW_OBJECT TopWindow;
if(Window->Style & WS_DISABLED)
{
/* FIXME - Activate a modal dialog window if available */
return FALSE;
}
Top = NtUserGetAncestor(Window->Self, GA_ROOT);
if (Top != Window->Self)
{
@ -197,6 +203,7 @@ IntMouseActivateWindow(PWINDOW_OBJECT Window)
{
IntReleaseWindowObject(TopWindow);
}
return TRUE;
}
HWND FASTCALL