win32u: Move menu object declarations to menu.c.

dlls/win32u/ntuser_private.h

@@ -205,55 +205,6 @@ enum builtin_winprocs
     NB_BUILTIN_AW_WINPROCS = WINPROC_DESKTOP
 };
 
-/* FIXME: make it private to menu.c */
-
-/* Menu item structure */
-typedef struct menu_item
-{
-    /* ----------- MENUITEMINFO Stuff ----------- */
-    UINT      fType;          /* Item type. */
-    UINT      fState;         /* Item state.  */
-    UINT_PTR  wID;            /* Item id.  */
-    HMENU     hSubMenu;       /* Pop-up menu.  */
-    HBITMAP   hCheckBit;      /* Bitmap when checked.  */
-    HBITMAP   hUnCheckBit;    /* Bitmap when unchecked.  */
-    LPWSTR    text;           /* Item text. */
-    ULONG_PTR dwItemData;     /* Application defined.  */
-    LPWSTR    dwTypeData;     /* depends on fMask */
-    HBITMAP   hbmpItem;       /* bitmap */
-    /* ----------- Wine stuff ----------- */
-    RECT      rect;           /* Item area (relative to the items_rect),
-                               * see MENU_AdjustMenuItemRect(). */
-    UINT      xTab;           /* X position of text after Tab */
-    SIZE      bmpsize;        /* size needed for the HBMMENU_CALLBACK bitmap */
-} MENUITEM;
-
-typedef struct
-{
-    struct user_object obj;
-    WORD        wFlags;       /* Menu flags (MF_POPUP, MF_SYSMENU) */
-    WORD	Width;        /* Width of the whole menu */
-    WORD	Height;       /* Height of the whole menu */
-    UINT        nItems;       /* Number of items in the menu */
-    HWND        hWnd;         /* Window containing the menu */
-    struct menu_item *items;  /* Array of menu items */
-    UINT        FocusedItem;  /* Currently focused item */
-    HWND	hwndOwner;    /* window receiving the messages for ownerdraw */
-    BOOL        bScrolling;   /* Scroll arrows are active */
-    UINT        nScrollPos;   /* Current scroll position */
-    UINT        nTotalHeight; /* Total height of menu items inside menu */
-    RECT        items_rect;   /* Rectangle within which the items lie.  Excludes margins and scroll arrows */
-    LONG        refcount;
-    /* ------------ MENUINFO members ------ */
-    DWORD	dwStyle;	/* Extended menu style */
-    UINT	cyMax;		/* max height of the whole menu, 0 is screen height */
-    HBRUSH	hbrBack;	/* brush for menu background */
-    DWORD	dwContextHelpID;
-    ULONG_PTR	dwMenuData;	/* application defined value */
-    HMENU       hSysMenuOwner;  /* Handle to the dummy sys menu holder */
-    WORD        textOffset;     /* Offset of text when items have both bitmaps and text */
-} POPUPMENU, *LPPOPUPMENU;
-
 /* FIXME: make it private to class.c */
 typedef struct tagWINDOWPROC
 {