mirror of
https://github.com/reactos/reactos.git
synced 2024-12-29 02:25:17 +00:00
Top level windows have menus, child windows have IDs
svn path=/trunk/; revision=8201
This commit is contained in:
parent
f273240d3f
commit
a9f2364436
1 changed files with 9 additions and 2 deletions
|
@ -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.183 2004/02/15 07:39:12 gvg Exp $
|
/* $Id: window.c,v 1.184 2004/02/15 20:50:56 gvg Exp $
|
||||||
*
|
*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
|
@ -1280,7 +1280,14 @@ NtUserCreateWindowEx(DWORD dwExStyle,
|
||||||
WindowObject->IDMenu = 0;
|
WindowObject->IDMenu = 0;
|
||||||
WindowObject->Instance = hInstance;
|
WindowObject->Instance = hInstance;
|
||||||
WindowObject->Self = Handle;
|
WindowObject->Self = Handle;
|
||||||
|
if (0 != (dwStyle & WS_CHILD))
|
||||||
|
{
|
||||||
|
WindowObject->IDMenu = (UINT) hMenu;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
IntSetMenu(WindowObject, hMenu, &MenuChanged);
|
IntSetMenu(WindowObject, hMenu, &MenuChanged);
|
||||||
|
}
|
||||||
WindowObject->MessageQueue = PsGetWin32Thread()->MessageQueue;
|
WindowObject->MessageQueue = PsGetWin32Thread()->MessageQueue;
|
||||||
WindowObject->Parent = ParentWindow;
|
WindowObject->Parent = ParentWindow;
|
||||||
WindowObject->Owner = IntGetWindowObject(OwnerWindowHandle);
|
WindowObject->Owner = IntGetWindowObject(OwnerWindowHandle);
|
||||||
|
|
Loading…
Reference in a new issue