ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

specify WS_CAPTION.
This commit is contained in:
Thuy Nguyen 1999-08-07 12:25:32 +00:00 committed by Alexandre Julliard
parent 028e9a1720
commit 46570a9dbd
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
windows/nonclient.c
View File

@ -98,8 +98,8 @@ BOOL WIN_WindowNeedsWMBorder( DWORD style, DWORD exStyle )
{
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 @@ NC_DoNCHitTest95 (WND *wndPtr, POINT16 pt )
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 @@ NC_DrawSysButton95 (HWND hwnd, HDC hdc, BOOL down)
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),