reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-15 02:18:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not change the WS_CHILD style in SetParent.

Browse Source
This commit is contained in:
Gerard Patel 2000-06-13 03:35:36 +00:00 committed by Alexandre Julliard
parent 5ea22474bb
commit e908fd3865
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
windows/x11drv/wnd.c
View File

@ -267,7 +267,8 @@ BOOL X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCTA *cs, BO
/* Create the X window (only for top-level windows, and then only */
/* when there's no desktop window) */
if (!(cs->style & WS_CHILD) && (X11DRV_GetXRootWindow() == DefaultRootWindow(display)))
if ((X11DRV_GetXRootWindow() == DefaultRootWindow(display))
&& (wndPtr->parent->hwndSelf == GetDesktopWindow()))
{
Window wGroupLeader;
XWMHints* wm_hints;
@ -446,7 +447,6 @@ WND *X11DRV_WND_SetParent(WND *wndPtr, WND *pWndParent)
if( pWndParent == pDesktop )
{
wndPtr->dwStyle &= ~WS_CHILD;
if( X11DRV_GetXRootWindow() == DefaultRootWindow(display) )
{
CREATESTRUCTA cs;
@ -474,7 +474,6 @@ WND *X11DRV_WND_SetParent(WND *wndPtr, WND *pWndParent)
{
if( !( wndPtr->dwStyle & WS_CHILD ) )
{
wndPtr->dwStyle |= WS_CHILD;
if( wndPtr->wIDmenu != 0)
{
DestroyMenu( (HMENU) wndPtr->wIDmenu );