[ros-diffs] [navaraf] 14141: Ulrich Czekalla <[e-mail]>

Ulrich Czekalla <ulrich(a)codeweavers.com>
Set WS_EX_CONTROLPARENT when dialog has DS_CONTROL.
Mike McCormack <mike(a)codeweavers.com>
Strip WS_CAPTION and WS_SYSMENU for child dialogs.
Modified: trunk/reactos/lib/user32/windows/dialog.c
  _____  

Modified: trunk/reactos/lib/user32/windows/dialog.c
--- trunk/reactos/lib/user32/windows/dialog.c	2005-03-16 19:27:45 UTC
(rev 14140)
+++ trunk/reactos/lib/user32/windows/dialog.c	2005-03-16 20:13:55 UTC
(rev 14141)
@@ -708,8 +708,12 @@

     rect.left = rect.top = 0;
     rect.right = MulDiv(template.cx, dlgInfo->xBaseUnit, 4);
     rect.bottom =  MulDiv(template.cy, dlgInfo->yBaseUnit, 8);
+    if (template.style & WS_CHILD)
+        template.style &= ~(WS_CAPTION|WS_SYSMENU);
     if (template.style & DS_MODALFRAME)
         template.exStyle |= WS_EX_DLGMODALFRAME;
+    if (template.style & DS_CONTROL)
+        template.exStyle |= WS_EX_CONTROLPARENT;
     AdjustWindowRectEx( &rect, template.style, (dlgInfo->hMenu != 0),
template.exStyle );
     rect.right -= rect.left;
     rect.bottom -= rect.top;