[jimtabor] 71689: [NtUser] - Remove unused code, enhance wine'isms while checking for menus.

Author: jimtabor
Date: Tue Jun 28 16:15:06 2016
New Revision: 71689

URL: http://svn.reactos.org/svn/reactos?rev=71689&view=rev
Log:
[NtUser]
- Remove unused code, enhance wine'isms while checking for menus.

Modified:
    trunk/reactos/win32ss/user/ntuser/nonclient.c

Modified: trunk/reactos/win32ss/user/ntuser/nonclient.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/nonclie...
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/nonclient.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/nonclient.c	[iso-8859-1] Tue Jun 28 16:15:06 2016
@@ -679,12 +679,6 @@
   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 @@
    {
       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 @@
    {
      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;