X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/56b18fda9452fc39ba91f4060a39721db7e2f437..62c9b3d73fdf9a892a311241f1effc12dde0282a:/include/wx/msw/missing.h

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index c2754e68cb..67681d6464 100644
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -211,10 +211,36 @@ 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
@@ -235,6 +261,9 @@ 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
@@ -296,6 +325,7 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 
 #ifdef __DMC__
 
+#ifndef VER_NT_WORKSTATION
 typedef struct _OSVERSIONINFOEX {
     DWORD dwOSVersionInfoSize;
     DWORD dwMajorVersion;
@@ -309,6 +339,7 @@ typedef struct _OSVERSIONINFOEX {
     BYTE  wProductType;
     BYTE  wReserved;
 } OSVERSIONINFOEX;
+#endif // !defined(VER_NT_WORKSTATION)
 
 #ifndef _TrackMouseEvent
     #define _TrackMouseEvent TrackMouseEvent
@@ -365,9 +396,6 @@ typedef struct _OSVERSIONINFOEX {
 #ifndef HDS_FULLDRAG
     #define HDS_FULLDRAG 0x0080
 #endif
-#ifndef HDS_FLAT
-    #define HDS_FLAT 0x0200
-#endif
 
 
 #ifndef HDN_BEGINDRAG