Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-12 09:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

- NtUserSetActiveWindow now called in CreateWindowEx

Browse source 
svn path=/trunk/; revision=5582
This commit is contained in:
Richard Campbell 2003-08-15 10:53:16 +00:00
parent 1fd05861d6
commit 1c8bc47bcc
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
reactos/subsys/win32k/ntuser/window.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: window.c,v 1.92 2003/08/15 02:51:53 silverblade Exp $ /* $Id: window.c,v 1.93 2003/08/15 10:53:16 rcampbell Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -679,14 +679,6 @@ NtUserCreateWindowEx(DWORD dwExStyle,
WindowObject->Style = dwStyle; WindowObject->Style = dwStyle;
DbgPrint("1: Style is now %d\n", WindowObject->Style); DbgPrint("1: Style is now %d\n", WindowObject->Style);
if (0 == (dwStyle & WS_CHILD))
{
WindowObject->Flags |= WIN_NCACTIVATED;
// THIS MESSES UP BUTTONS: WIN_NCACTIVATED == BS_BITMAP !
WindowObject->Style = WindowObject->Style | WIN_NCACTIVATED;
DbgPrint("2: Style is now %d\n", WindowObject->Style);
}
WindowObject->x = x; WindowObject->x = x;
WindowObject->y = y; WindowObject->y = y;
WindowObject->Width = nWidth; WindowObject->Width = nWidth;
@ -922,7 +914,9 @@ NtUserCreateWindowEx(DWORD dwExStyle,
DPRINT("NtUserCreateWindow(): About to show window\n"); DPRINT("NtUserCreateWindow(): About to show window\n");
WinPosShowWindow(WindowObject->Self, dwShowMode); WinPosShowWindow(WindowObject->Self, dwShowMode);
} }
/* FIXME: Should code be reworked to accomodate the following line? */
DbgPrint("Setting Active Window to %d\n\n\n",WindowObject->Self);
NtUserSetActiveWindow(WindowObject->Self);
DPRINT("NtUserCreateWindow(): = %X\n", Handle); DPRINT("NtUserCreateWindow(): = %X\n", Handle);
return((HWND)Handle); return((HWND)Handle);
} }

4
reactos/subsys/win32k/ntuser/winpos.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: winpos.c,v 1.23 2003/08/11 21:10:49 royce Exp $ /* $Id: winpos.c,v 1.24 2003/08/15 10:53:16 rcampbell Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -1249,6 +1249,8 @@ WinPosSetActiveWindow(PWINDOW_OBJECT Window, BOOL Mouse, BOOL ChangeFocus)
{ {
ActiveQueue->ActiveWindow = NULL; ActiveQueue->ActiveWindow = NULL;
} }
/* FIXME: Unset this flag for inactive windows */
//if ((Window->Style) & WS_CHILD) Window->Flags |= WIN_NCACTIVATED;
/* FIXME: Send palette messages. */ /* FIXME: Send palette messages. */