Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

define MIIM_BITMAP &c in wx/msw/missing.h instead of msw/menu.cpp as menuitem.cpp now needs them too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58562 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-01-31 20:52:44 +00:00
parent 52ceb90e10
commit 33f4afdbc0
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/msw/missing.h
View File

@@ -210,6 +210,28 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
#endif // defined __VISUALC__ && __VISUALC__ <= 1100 #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 // definitions related to ListView and Header common controls, needed by
// msw/listctrl.cpp and msw/headerctrl.cpp // msw/listctrl.cpp and msw/headerctrl.cpp

18
src/msw/menu.cpp
View File

@@ -61,24 +61,6 @@
// other standard headers // other standard headers
#include <string.h> #include <string.h>
//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 #if wxUSE_OWNER_DRAWN
#include "wx/dynlib.h" #include "wx/dynlib.h"
#endif #endif