X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aad7e71c66c191f95ff4b922db3ddcf194e12be3..e4c903b2ea42fe104ef50d0ea6028f14d8309dfa:/include/wx/msw/missing.h?ds=inline diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index 6c9c3bb52f..f4961c2562 100644 --- a/include/wx/msw/missing.h +++ b/include/wx/msw/missing.h @@ -29,19 +29,26 @@ #define WM_CONTEXTMENU 0x007B #endif -// Needed by toplevel.cpp +#ifndef WM_CHANGEUISTATE + #define WM_CHANGEUISTATE 0x0127 +#endif + #ifndef WM_UPDATEUISTATE #define WM_UPDATEUISTATE 0x0128 #endif -#ifndef WM_CHANGEUISTATE - #define WM_CHANGEUISTATE 0x0127 +#ifndef WM_QUERYUISTATE + #define WM_QUERYUISTATE 0x0129 #endif #ifndef WM_PRINTCLIENT #define WM_PRINTCLIENT 0x318 #endif +#ifndef DT_HIDEPREFIX + #define DT_HIDEPREFIX 0x00100000 +#endif + // Needed by toplevel.cpp #ifndef UIS_SET #define UIS_SET 1 @@ -211,15 +218,42 @@ typedef struct wxtagNMLVCUSTOMDRAW_ { #endif // defined __VISUALC__ && __VISUALC__ <= 1100 // ---------------------------------------------------------------------------- -// ListView common control -// Needed by listctrl.cpp +// 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 +// ---------------------------------------------------------------------------- + +#ifndef I_IMAGENONE + #define I_IMAGENONE (-2) +#endif + #ifndef LVS_EX_FULLROWSELECT #define LVS_EX_FULLROWSELECT 0x00000020 #endif -#ifndef LVS_EX_LABELTIP +// LVS_EX_LABELTIP is not supported by Windows CE, don't define it there +#if !defined(LVS_EX_LABELTIP) && !defined(__WXWINCE__) #define LVS_EX_LABELTIP 0x00004000 #endif @@ -234,6 +268,14 @@ typedef struct wxtagNMLVCUSTOMDRAW_ { #ifndef HDS_HOTTRACK #define HDS_HOTTRACK 4 #endif +#ifndef HDS_FLAT + #define HDS_FLAT 0x0200 +#endif + +#ifndef HDF_SORTUP + #define HDF_SORTUP 0x0400 + #define HDF_SORTDOWN 0x0200 +#endif /* * In addition to the above, the following are required for several compilers. @@ -290,6 +332,7 @@ typedef struct wxtagNMLVCUSTOMDRAW_ { #ifdef __DMC__ +#ifndef VER_NT_WORKSTATION typedef struct _OSVERSIONINFOEX { DWORD dwOSVersionInfoSize; DWORD dwMajorVersion; @@ -303,6 +346,7 @@ typedef struct _OSVERSIONINFOEX { BYTE wProductType; BYTE wReserved; } OSVERSIONINFOEX; +#endif // !defined(VER_NT_WORKSTATION) #ifndef _TrackMouseEvent #define _TrackMouseEvent TrackMouseEvent @@ -353,10 +397,14 @@ typedef struct _OSVERSIONINFOEX { #define NMHEADER HD_NOTIFY #endif +#ifndef HDS_DRAGDROP + #define HDS_DRAGDROP 0x0040 +#endif #ifndef HDS_FULLDRAG - #define HDS_FULLDRAG 128 + #define HDS_FULLDRAG 0x0080 #endif + #ifndef HDN_BEGINDRAG #define HDN_BEGINDRAG (HDN_FIRST - 11) #endif