mirror of
https://github.com/reactos/reactos.git
synced 2024-08-01 09:01:13 +00:00
[NtUser]
- Remove unused code, enhance wine'isms while checking for menus. svn path=/trunk/; revision=71689
This commit is contained in:
parent
4c070bf073
commit
87b3226b1d
|
@ -679,12 +679,6 @@ IntIsScrollBarVisible(PWND pWnd, INT hBar)
|
||||||
return !(sbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN);
|
return !(sbi.rgstate[0] & STATE_SYSTEM_OFFSCREEN);
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL
|
|
||||||
UserHasMenu(PWND pWnd, ULONG Style)
|
|
||||||
{
|
|
||||||
return (!(Style & WS_CHILD) && UlongToHandle(pWnd->IDMenu) != 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* FIXME:
|
* FIXME:
|
||||||
* - Cache bitmaps, then just bitblt instead of calling DFC() (and
|
* - Cache bitmaps, then just bitblt instead of calling DFC() (and
|
||||||
|
@ -951,7 +945,7 @@ VOID UserDrawCaptionBar(
|
||||||
{
|
{
|
||||||
PMENU menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu));
|
PMENU menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu));
|
||||||
/* Draw menu bar */
|
/* Draw menu bar */
|
||||||
if (menu && !(Style & WS_CHILD))
|
if ( menu && (((Style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) )
|
||||||
{
|
{
|
||||||
TempRect = CurrentRect;
|
TempRect = CurrentRect;
|
||||||
TempRect.bottom = TempRect.top + menu->cyMenu;
|
TempRect.bottom = TempRect.top + menu->cyMenu;
|
||||||
|
@ -1120,7 +1114,7 @@ NC_DoNCPaint(PWND pWnd, HDC hDC, INT Flags)
|
||||||
{
|
{
|
||||||
PMENU menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu));
|
PMENU menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu));
|
||||||
/* Draw menu bar */
|
/* Draw menu bar */
|
||||||
if (menu && !(Style & WS_CHILD))
|
if ( menu && (((Style) & (WS_CHILD | WS_POPUP)) != WS_CHILD) )
|
||||||
{
|
{
|
||||||
TempRect = CurrentRect;
|
TempRect = CurrentRect;
|
||||||
TempRect.bottom = TempRect.top + menu->cyMenu;
|
TempRect.bottom = TempRect.top + menu->cyMenu;
|
||||||
|
|
Loading…
Reference in a new issue