commit 46570a9dbd231bb87215ee38d4ff1413e8ded349
author Thuy Nguyen <thuy@macadamian.com> Sat Aug 07 12:25:32 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Aug 07 12:25:32 1999 +0000
tree 817505087838c1643c3c49376b9424d08809bdbb
parent 028e9a1720b690154ba976d08263c6f69eedd508

WS_EX_DLGMODALFRAME alone does not mean title bar, you still have to
specify WS_CAPTION.

windows/nonclient.c

diff --git a/windows/nonclient.c b/windows/nonclient.c
index 0e41482..d7a2b95 100644
--- a/windows/nonclient.c
+++ b/windows/nonclient.c
@@ -98,8 +98,8 @@
 {
     if (!(style & WS_CHILD) && Options.managed  &&
         (((style & WS_CAPTION) == WS_CAPTION) ||
-         (style & WS_THICKFRAME) ||
-         (exStyle & WS_EX_DLGMODALFRAME))) return TRUE;
+         (style & WS_THICKFRAME)))
+        return TRUE;
     return FALSE;
 }
 
@@ -861,9 +861,7 @@
             if (!PtInRect16( &rect, pt ))
             {
                 /* Check system menu */
-                if ((wndPtr->dwStyle & WS_SYSMENU) &&
-		    (((HICON) GetClassLongA(wndPtr->hwndSelf, GCL_HICONSM)) ||
-		     ((HICON) GetClassLongA(wndPtr->hwndSelf, GCL_HICON))))
+                if ((wndPtr->dwStyle & WS_SYSMENU) && (!(wndPtr->dwStyle & DS_MODALFRAME)))
                     rect.left += GetSystemMetrics(SM_CYCAPTION) - 1;
                 if (pt.x < rect.left) return HTSYSMENU;
 
@@ -1061,6 +1059,12 @@
 	hIcon = (HICON) GetClassLongA(wndPtr->hwndSelf, GCL_HICONSM);
 	if(!hIcon) hIcon = (HICON) GetClassLongA(wndPtr->hwndSelf, GCL_HICON);
 
+	/* If there is no hIcon specified or this is not a modal dialog, */ 
+        /* get the default one.                                          */
+	if(hIcon == 0) 
+	    if (!(wndPtr->dwStyle & DS_MODALFRAME))
+		hIcon = LoadImageA(0, MAKEINTRESOURCEA(OIC_WINEICON), IMAGE_ICON, 0, 0, LR_DEFAULTCOLOR);
+
 	if (hIcon)
 	    DrawIconEx (hdc, rect.left + 2, rect.top + 2, hIcon,
 			  GetSystemMetrics(SM_CXSMICON),