Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 12:45:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NtUser]

Browse source 
- Remove unused code, enhance wine'isms while checking for menus.

svn path=/trunk/; revision=71689
This commit is contained in:
James Tabor 2016-06-28 16:15:06 +00:00
parent 4c070bf073
commit 87b3226b1d
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/win32ss/user/ntuser/nonclient.c
View file

@ -679,12 +679,6 @@ IntIsScrollBarVisible(PWND pWnd, INT hBar)
return !(sbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN);
}
BOOL
UserHasMenu(PWND pWnd, ULONG Style)
{
return (!(Style & WS_CHILD) && UlongToHandle(pWnd->IDMenu) != 0);
}
/*
* FIXME:
* - Cache bitmaps, then just bitblt instead of calling DFC() (and
@ -951,7 +945,7 @@ VOID UserDrawCaptionBar(
{
PMENU menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu));
/* Draw menu bar */
if (menu && !(Style & WS_CHILD))
if ( menu && (((Style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) )
{
TempRect = CurrentRect;
TempRect.bottom = TempRect.top + menu->cyMenu;
@ -1120,7 +1114,7 @@ NC_DoNCPaint(PWND pWnd, HDC hDC, INT Flags)
{
PMENU menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu));
/* Draw menu bar */
if (menu && !(Style & WS_CHILD))
if ( menu && (((Style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) )
{
TempRect = CurrentRect;
TempRect.bottom = TempRect.top + menu->cyMenu;