X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/24aab8e81a8627802e4111d9c99a50ece8d0026e..a4e3249255361245b5a4bc746e40374f2186439e:/include/wx/msw/missing.h

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 3c3218ae2a..67681d6464 100644
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -122,14 +122,26 @@
 #endif
 
 
+#ifndef WS_EX_LAYOUTRTL
+#define WS_EX_LAYOUTRTL 0x00400000
+#endif
+
+#ifndef WS_EX_COMPOSITED
+#define WS_EX_COMPOSITED 0x02000000L
+#endif
+
 #ifndef WS_EX_LAYERED
-#define WS_EX_LAYERED 0x80000
+#define WS_EX_LAYERED 0x00080000
 #endif
 
 #ifndef LWA_ALPHA
 #define LWA_ALPHA 2
 #endif
 
+#ifndef QS_ALLPOSTMESSAGE
+#define QS_ALLPOSTMESSAGE 0
+#endif
+
 /*
  * The following are required for VC++ 5 when the PSDK is not available.
  */
@@ -182,7 +194,7 @@ typedef OSVERSIONINFOEXA OSVERSIONINFOEX,*POSVERSIONINFOEX,*LPOSVERSIONINFOEX;
 // NMLVCUSTOMDRAW originally didn't have the iSubItem member. It was added
 // with IE4, as was IPN_FIRST which is used as a test :-(.
 //
-#ifndef IPN_FIRST	
+#ifndef IPN_FIRST
 
 typedef struct wxtagNMLVCUSTOMDRAW_ {
     NMCUSTOMDRAW nmcd;
@@ -194,20 +206,47 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 #define NMLVCUSTOMDRAW wxNMLVCUSTOMDRAW_
 #define LPNMLVCUSTOMDRAW wxLPNMLVCUSTOMDRAW_
 
-#endif // defined IPN_FIRST	
+#endif // defined IPN_FIRST
 
 #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
 
@@ -219,6 +258,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.
   */
@@ -227,6 +278,10 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 #define CCS_VERT                0x00000080L
 #endif
 
+#if !defined(CCS_RIGHT)
+#define CCS_RIGHT               (CCS_VERT|CCS_BOTTOM)
+#endif
+
 #if !defined(TB_SETDISABLEDIMAGELIST)
     #define TB_SETDISABLEDIMAGELIST (WM_USER + 54)
 #endif // !defined(TB_SETDISABLEDIMAGELIST)
@@ -270,6 +325,7 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 
 #ifdef __DMC__
 
+#ifndef VER_NT_WORKSTATION
 typedef struct _OSVERSIONINFOEX {
     DWORD dwOSVersionInfoSize;
     DWORD dwMajorVersion;
@@ -283,6 +339,7 @@ typedef struct _OSVERSIONINFOEX {
     BYTE  wProductType;
     BYTE  wReserved;
 } OSVERSIONINFOEX;
+#endif // !defined(VER_NT_WORKSTATION)
 
 #ifndef _TrackMouseEvent
     #define _TrackMouseEvent TrackMouseEvent
@@ -321,6 +378,34 @@ typedef struct _OSVERSIONINFOEX {
     #define LVM_GETHEADER (LVM_FIRST+31)
 #endif
 
+#ifndef HDLAYOUT
+    #define HDLAYOUT HD_LAYOUT
+#endif
+
+#ifndef HDITEM
+    #define HDITEM HD_ITEM
+#endif
+
+#ifndef NMHEADER
+    #define NMHEADER HD_NOTIFY
+#endif
+
+#ifndef HDS_DRAGDROP
+    #define HDS_DRAGDROP 0x0040
+#endif
+#ifndef HDS_FULLDRAG
+    #define HDS_FULLDRAG 0x0080
+#endif
+
+
+#ifndef HDN_BEGINDRAG
+    #define HDN_BEGINDRAG (HDN_FIRST - 11)
+#endif
+
+#ifndef HDN_ENDDRAG
+    #define HDN_ENDDRAG (HDN_FIRST - 10)
+#endif
+
 #ifndef LVSICF_NOSCROLL
     #define LVSICF_NOINVALIDATEALL  0x0001
     #define LVSICF_NOSCROLL         0x0002
@@ -408,6 +493,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
 
  /*