provide backward-compat wxCursor(int) ctor; remove empty stubs of XBM ctor from all...

[wxWidgets.git] / include / wx / msw / missing.h

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 337446e740613c057f68f6afc32d642edb7c570c..b13bc7736e6d62587b99f1e72603b2bc259bebab 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -219,7 +219,8 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
     #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 +232,15 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
     #define HDN_GETDISPINFOW (HDN_FIRST-29)
 #endif
 
+#ifndef HDS_HOTTRACK
+    #define HDS_HOTTRACK 4
+#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.
   */
@@ -349,10 +359,6 @@ typedef struct _OSVERSIONINFOEX {
     #define NMHEADER HD_NOTIFY
 #endif
 
-#ifndef HDS_HOTTRACK
-    #define HDS_HOTTRACK 4
-#endif
-
 #ifndef HDS_FULLDRAG
     #define HDS_FULLDRAG 128
 #endif
@@ -452,6 +458,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
 
  /*