Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 2acd3983c29ac96c19f08558e0e79bfe939dac56..f75c2d2b667bdeabc9ad9f167939f7211e49b141 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -126,6 +126,10 @@
 #define WS_EX_LAYOUTRTL 0x00400000
 #endif
 
 #define WS_EX_LAYOUTRTL 0x00400000
 #endif
 

+#ifndef WS_EX_COMPOSITED
+#define WS_EX_COMPOSITED 0x02000000L
+#endif
+

 #ifndef WS_EX_LAYERED
 #define WS_EX_LAYERED 0x00080000
 #endif
 #ifndef WS_EX_LAYERED
 #define WS_EX_LAYERED 0x00080000
 #endif


@@ -134,6 +138,10 @@
 #define LWA_ALPHA 2
 #endif
 
 #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.
  */


@@ -186,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;


@@ -198,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
 


@@ -223,6 +231,10 @@ 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
+

  /*
   * In addition to the above, the following are required for several compilers.
   */
  /*
   * In addition to the above, the following are required for several compilers.
   */


@@ -231,6 +243,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)


@@ -325,6 +341,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