Skip to content

W
wine-cw
Commit e908fd38 authored by Gerard Patel's avatar Gerard Patel Committed by Alexandre Julliard
Browse files
Options

Do not change the WS_CHILD style in SetParent.

parent 5ea22474
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
windows/x11drv/wnd.c
View file @ e908fd38
...@@ -267,7 +267,8 @@ BOOL X11DRV_WND_CreateWindow(WND *wndPtr, CLASS *classPtr, CREATESTRUCTA *cs, BO ...@@ -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 */ /* Create the X window (only for top-level windows, and then only */
/* when there's no desktop window) */ /* 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; Window wGroupLeader;
XWMHints* wm_hints; XWMHints* wm_hints;
...@@ -446,7 +447,6 @@ WND *X11DRV_WND_SetParent(WND *wndPtr, WND *pWndParent) ...@@ -446,7 +447,6 @@ WND *X11DRV_WND_SetParent(WND *wndPtr, WND *pWndParent)
if( pWndParent == pDesktop ) if( pWndParent == pDesktop )
{ {
wndPtr->dwStyle &= ~WS_CHILD;
if( X11DRV_GetXRootWindow() == DefaultRootWindow(display) ) if( X11DRV_GetXRootWindow() == DefaultRootWindow(display) )
{ {
CREATESTRUCTA cs; CREATESTRUCTA cs;
...@@ -474,7 +474,6 @@ WND *X11DRV_WND_SetParent(WND *wndPtr, WND *pWndParent) ...@@ -474,7 +474,6 @@ WND *X11DRV_WND_SetParent(WND *wndPtr, WND *pWndParent)
{ {
if( !( wndPtr->dwStyle & WS_CHILD ) ) if( !( wndPtr->dwStyle & WS_CHILD ) )
{ {
wndPtr->dwStyle |= WS_CHILD;
if( wndPtr->wIDmenu != 0) if( wndPtr->wIDmenu != 0)
{ {
DestroyMenu( (HMENU) wndPtr->wIDmenu ); DestroyMenu( (HMENU) wndPtr->wIDmenu );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment