Add to patch 1671804 (menu alignment for VC6) so that it does work, and move

it to msw/missing.h.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@46333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Michael Wetherell
2007-06-05 16:40:12 +00:00
parent 1880068bb9
commit 243ad5c89e
2 changed files with 43 additions and 25 deletions

View File

@@ -138,6 +138,40 @@
#define LWA_ALPHA 2
#endif
#if defined __VISUALC__ && __VISUALC__ <= 1200 && !defined MIIM_BITMAP
#define MIIM_STRING 0x00000040
#define MIIM_BITMAP 0x00000080
#define MIIM_FTYPE 0x00000100
#define HBMMENU_CALLBACK ((HBITMAP) -1)
typedef struct tagMENUINFO
{
DWORD cbSize;
DWORD fMask;
DWORD dwStyle;
UINT cyMax;
HBRUSH hbrBack;
DWORD dwContextHelpID;
DWORD dwMenuData;
} MENUINFO, FAR *LPMENUINFO;
struct wxMENUITEMINFO_
{
UINT cbSize;
UINT fMask;
UINT fType;
UINT fState;
UINT wID;
HMENU hSubMenu;
HBITMAP hbmpChecked;
HBITMAP hbmpUnchecked;
DWORD dwItemData;
LPTSTR dwTypeData;
UINT cch;
HBITMAP hbmpItem;
};
#else
#define wxMENUITEMINFO_ MENUITEMINFO
#endif
/*
* The following are required for VC++ 5 when the PSDK is not available.
*/