Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-17 00:03:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Update more menu types and flags.

Browse source 
svn path=/trunk/; revision=46134
This commit is contained in:
James Tabor 2010-03-12 16:11:28 +00:00
parent fcf8a0b515
commit d647d02aa4
2 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/include/psdk/winuser.h
View file

@ -2446,8 +2446,18 @@ extern "C" {
#define ODS_DISABLED 4 #define ODS_DISABLED 4
#define ODS_CHECKED 8 #define ODS_CHECKED 8
#define ODS_FOCUS 16 #define ODS_FOCUS 16
#if(WINVER >= 0x0400)
#define ODS_DEFAULT 32 #define ODS_DEFAULT 32
#define ODS_COMBOBOXEDIT 4096 #define ODS_COMBOBOXEDIT 4096
#endif
#if(WINVER >= 0x0500)
#define ODS_HOTLIGHT 0x0040
#define ODS_INACTIVE 0x0080
#if(_WIN32_WINNT >= 0x0500)
#define ODS_NOACCEL 0x0100
#define ODS_NOFOCUSRECT 0x0200
#endif
#endif
#define IDHOT_SNAPWINDOW (-1) #define IDHOT_SNAPWINDOW (-1)
#define IDHOT_SNAPDESKTOP (-2) #define IDHOT_SNAPDESKTOP (-2)
#define DBWF_LPARAMPOINTER 0x8000 #define DBWF_LPARAMPOINTER 0x8000

18
reactos/include/reactos/win32k/ntuser.h
View file

@ -221,12 +221,15 @@ C_ASSERT(sizeof(CLIENTINFO) == FIELD_OFFSET(TEB, glDispatchTable) - FIELD_OFFSET
#define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo)) #define GetWin32ClientInfo() ((PCLIENTINFO)(NtCurrentTeb()->Win32ClientInfo))
/* Menu Item fType. */
#define MFT_RTOL 0x6000
typedef struct tagITEM typedef struct tagITEM
{ {
UINT fType; UINT fType;
UINT fState; UINT fState;
UINT wID; UINT wID;
struct tagMENU* spSubMenu; /* Pop-up menu. */ struct tagMENU* spSubMenu; /* Pop-up menu. */
HANDLE hbmpChecked; HANDLE hbmpChecked;
HANDLE hbmpUnchecked; HANDLE hbmpUnchecked;
USHORT* lpstr; /* Item text pointer. */ USHORT* lpstr; /* Item text pointer. */
@ -250,12 +253,21 @@ typedef struct tagMENULIST
struct tagMENU* pMenu; struct tagMENU* pMenu;
} MENULIST, *PMENULIST; } MENULIST, *PMENULIST;
/* Menu fFlags, upper byte is MNS_X style flags. */
#define MNF_POPUP 0x0001
#define MNF_UNDERLINE 0x0004
#define MNF_INACTIVE 0x0010
#define MNF_RTOL 0x0020
#define MNF_DESKTOPMN 0x0040
#define MNF_SYSDESKMN 0x0080
#define MNF_SYSSUBMENU 0x0100
typedef struct tagMENU typedef struct tagMENU
{ {
PROCDESKHEAD head; PROCDESKHEAD head;
ULONG fFlags; /* Menu flags (MF_POPUP, MF_SYSMENU) */ ULONG fFlags; /* [Style flags | Menu flags] */
INT iItem; /* nPos of selected item, if -1 not selected. */ INT iItem; /* nPos of selected item, if -1 not selected. */
UINT cAlloced; /* Number of allocated items. */ UINT cAlloced; /* Number of allocated items. Inc's of 8 */
UINT cItems; /* Number of items in the menu */ UINT cItems; /* Number of items in the menu */
ULONG cxMenu; /* Width of the whole menu */ ULONG cxMenu; /* Width of the whole menu */
ULONG cyMenu; /* Height of the whole menu */ ULONG cyMenu; /* Height of the whole menu */