From 33f4afdbc08a2a8b8438420aa9d16aadee0bacc2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 31 Jan 2009 20:52:44 +0000 Subject: [PATCH] define MIIM_BITMAP &c in wx/msw/missing.h instead of msw/menu.cpp as menuitem.cpp now needs them too git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/missing.h | 22 ++++++++++++++++++++++ src/msw/menu.cpp | 18 ------------------ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index 1bfea59843..67681d6464 100644 --- a/include/wx/msw/missing.h +++ b/include/wx/msw/missing.h @@ -210,6 +210,28 @@ typedef struct wxtagNMLVCUSTOMDRAW_ { #endif // defined __VISUALC__ && __VISUALC__ <= 1100 +// ---------------------------------------------------------------------------- +// menu stuff +// ---------------------------------------------------------------------------- + +#ifndef 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; +#endif // MIIM_BITMAP &c + // ---------------------------------------------------------------------------- // definitions related to ListView and Header common controls, needed by // msw/listctrl.cpp and msw/headerctrl.cpp diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp index 3ca6f20c5e..46346acca8 100644 --- a/src/msw/menu.cpp +++ b/src/msw/menu.cpp @@ -61,24 +61,6 @@ // other standard headers #include -//VC6 needs these defining, though they are in winuser.h -#ifndef 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; -#endif - #if wxUSE_OWNER_DRAWN #include "wx/dynlib.h" #endif -- 2.45.2