Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-20 11:29:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

- SetParent shouldn't destroy menus.

Browse source 
- UserGetAncestor(Window, GA_ROOT) really shouldn't return NULL, in any case.

svn path=/trunk/; revision=17946
This commit is contained in:
Filip Navara 2005-09-20 10:31:57 +00:00
parent 0bec9aee61
commit 27f30a175b
1 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -878,7 +878,6 @@ co_IntSetParent(PWINDOW_OBJECT Wnd, PWINDOW_OBJECT WndNewParent)
PWINDOW_OBJECT WndOldParent, Sibling, InsertAfter;
// HWND hWnd, hWndNewParent;
BOOL WasVisible;
BOOL MenuChanged;
ASSERT(Wnd);
ASSERT(WndNewParent);
@ -930,15 +929,6 @@ co_IntSetParent(PWINDOW_OBJECT Wnd, PWINDOW_OBJECT WndNewParent)
IntLinkWindow(Wnd, WndNewParent, InsertAfter /*prev sibling*/);
// UserDerefObject(InsertAfter);
}
if (WndNewParent->hSelf != IntGetDesktopWindow()) /* a child window */
{
if (!(Wnd->Style & WS_CHILD))
{
//if ( Wnd->Menu ) DestroyMenu ( Wnd->menu );
IntSetMenu(Wnd, NULL, &MenuChanged);
}
}
}
/*
@ -2553,11 +2543,6 @@ PWINDOW_OBJECT FASTCALL UserGetAncestor(PWINDOW_OBJECT Wnd, UINT Type)
{
PWINDOW_OBJECT WndAncestor, Parent;
if (Wnd->hSelf == IntGetDesktopWindow())
{
return NULL;
}
switch (Type)
{
case GA_PARENT: