Don't reserve space for empty menubar

svn path=/trunk/; revision=8871
This commit is contained in:
Gé van Geldorp 2004-03-25 11:40:41 +00:00
parent 9e558fcc6a
commit 95d5ae34d2

View file

@ -506,7 +506,6 @@ DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect)
if (!(Style & WS_MINIMIZE))
{
ULONG menuheight;
HMENU menu = GetMenu(hWnd);
UserGetWindowBorders(Style, ExStyle, &WindowBorders, FALSE);
@ -529,9 +528,8 @@ DefWndNCCalcSize(HWND hWnd, BOOL CalcSizeStruct, RECT *Rect)
CliRect.right -= OrigRect.left;
CliRect.left -= OrigRect.left;
CliRect.top -= OrigRect.top;
menuheight = (ULONG)MenuDrawMenuBar(hDC, &CliRect, hWnd, TRUE);
Rect->top += MenuDrawMenuBar(hDC, &CliRect, hWnd, TRUE);
ReleaseDC(hWnd, hDC);
Rect->top += max(menuheight, GetSystemMetrics(SM_CYMENU));
}
}