X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e229d82e0ecdef3b84c246a8eb4e976486f5c006..d8359d3ca077993d3ef61d6c09000ce7beeb577b:/include/wx/msw/missing.h

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 337446e740..1bfea59843 100644
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -211,15 +211,20 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 #endif // defined __VISUALC__ && __VISUALC__ <= 1100
 
 // ----------------------------------------------------------------------------
-// ListView common control
-// Needed by listctrl.cpp
+// 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
 
@@ -231,6 +236,18 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
     #define HDN_GETDISPINFOW (HDN_FIRST-29)
 #endif
 
+#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.
   */
@@ -286,6 +303,7 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 
 #ifdef __DMC__
 
+#ifndef VER_NT_WORKSTATION
 typedef struct _OSVERSIONINFOEX {
     DWORD dwOSVersionInfoSize;
     DWORD dwMajorVersion;
@@ -299,6 +317,7 @@ typedef struct _OSVERSIONINFOEX {
     BYTE  wProductType;
     BYTE  wReserved;
 } OSVERSIONINFOEX;
+#endif // !defined(VER_NT_WORKSTATION)
 
 #ifndef _TrackMouseEvent
     #define _TrackMouseEvent TrackMouseEvent
@@ -349,14 +368,14 @@ typedef struct _OSVERSIONINFOEX {
     #define NMHEADER HD_NOTIFY
 #endif
 
-#ifndef HDS_HOTTRACK
-    #define HDS_HOTTRACK 4
+#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
@@ -452,6 +471,20 @@ typedef struct _OSVERSIONINFOEX {
   */
 
 #if defined (__MINGW32__)
+
+#if !wxCHECK_W32API_VERSION(3,1)
+
+#include <windows.h>
+#include "wx/msw/winundef.h"
+
+typedef struct
+{
+    RECT       rgrc[3];
+    WINDOWPOS *lppos;
+} NCCALCSIZE_PARAMS, *LPNCCALCSIZE_PARAMS;
+
+#endif
+
 #endif
 
  /*