Cast for argument to delete[] - VC6 doesn't want to delete a const pointer

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 03480037f436c8c41a2a8e665e69cf41460d2e6d..b13bc7736e6d62587b99f1e72603b2bc259bebab 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -122,14 +122,26 @@
 #endif
 
 
 #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
 #ifndef WS_EX_LAYERED

-#define WS_EX_LAYERED 0x80000
+#define WS_EX_LAYERED 0x00080000

 #endif
 
 #ifndef LWA_ALPHA
 #define LWA_ALPHA 2
 #endif
 
 #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.
  */
 /*
  * 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 :-(.
 //
 // 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;
 
 typedef struct wxtagNMLVCUSTOMDRAW_ {
     NMCUSTOMDRAW nmcd;


@@ -194,7 +206,7 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 #define NMLVCUSTOMDRAW wxNMLVCUSTOMDRAW_
 #define LPNMLVCUSTOMDRAW wxLPNMLVCUSTOMDRAW_
 
 #define NMLVCUSTOMDRAW wxNMLVCUSTOMDRAW_
 #define LPNMLVCUSTOMDRAW wxLPNMLVCUSTOMDRAW_
 

-#endif // defined IPN_FIRST    
+#endif // defined IPN_FIRST

 
 #endif // defined __VISUALC__ && __VISUALC__ <= 1100
 
 
 #endif // defined __VISUALC__ && __VISUALC__ <= 1100
 


@@ -207,7 +219,8 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
     #define LVS_EX_FULLROWSELECT 0x00000020
 #endif
 
     #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
 
     #define LVS_EX_LABELTIP 0x00004000
 #endif
 


@@ -219,6 +232,15 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
     #define HDN_GETDISPINFOW (HDN_FIRST-29)
 #endif
 
     #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.
   */
  /*
   * In addition to the above, the following are required for several compilers.
   */


@@ -227,6 +249,10 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 #define CCS_VERT                0x00000080L
 #endif
 
 #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)
 #if !defined(TB_SETDISABLEDIMAGELIST)
     #define TB_SETDISABLEDIMAGELIST (WM_USER + 54)
 #endif // !defined(TB_SETDISABLEDIMAGELIST)


@@ -321,6 +347,30 @@ typedef struct _OSVERSIONINFOEX {
     #define LVM_GETHEADER (LVM_FIRST+31)
 #endif
 
     #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_FULLDRAG
+    #define HDS_FULLDRAG 128
+#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
 #ifndef LVSICF_NOSCROLL
     #define LVSICF_NOINVALIDATEALL  0x0001
     #define LVSICF_NOSCROLL         0x0002


@@ -408,6 +458,20 @@ typedef struct _OSVERSIONINFOEX {
   */
 
 #if defined (__MINGW32__)
   */
 
 #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
 
  /*
 #endif
 
  /*


@@ -418,5 +482,18 @@ typedef struct _OSVERSIONINFOEX {
     #include "wx/msw/wince/missing.h"
 #endif
 
     #include "wx/msw/wince/missing.h"
 #endif
 

+ /*
+  * The following are specifically required for Wine
+  */
+
+#ifdef __WINE__
+    #ifndef ENUM_CURRENT_SETTINGS
+        #define ENUM_CURRENT_SETTINGS   ((DWORD)-1)
+    #endif
+    #ifndef BROADCAST_QUERY_DENY
+        #define BROADCAST_QUERY_DENY    1112363332
+    #endif
+#endif  // defined __WINE__
+

 #endif
     // _WX_MISSING_H_
 #endif
     // _WX_MISSING_H_