Application of the most recent wxWebView patch, the only changes were so tab to space...

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index f0d8d85667dbe170b111a491574d1f705dbb3256..95157acc1b2079fc9593b65a2a984177996fa117 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -29,19 +29,26 @@
     #define WM_CONTEXTMENU      0x007B
 #endif
 
     #define WM_CONTEXTMENU      0x007B
 #endif
 

-// Needed by toplevel.cpp
+#ifndef WM_CHANGEUISTATE
+    #define WM_CHANGEUISTATE    0x0127
+#endif
+

 #ifndef WM_UPDATEUISTATE
     #define WM_UPDATEUISTATE    0x0128
 #endif
 
 #ifndef WM_UPDATEUISTATE
     #define WM_UPDATEUISTATE    0x0128
 #endif
 

-#ifndef WM_CHANGEUISTATE
-    #define WM_CHANGEUISTATE    0x0127
+#ifndef WM_QUERYUISTATE
+    #define WM_QUERYUISTATE     0x0129

 #endif
 
 #ifndef WM_PRINTCLIENT
     #define WM_PRINTCLIENT 0x318
 #endif
 
 #endif
 
 #ifndef WM_PRINTCLIENT
     #define WM_PRINTCLIENT 0x318
 #endif
 

+#ifndef DT_HIDEPREFIX
+    #define DT_HIDEPREFIX 0x00100000
+#endif
+

 // Needed by toplevel.cpp
 #ifndef UIS_SET
     #define UIS_SET         1
 // Needed by toplevel.cpp
 #ifndef UIS_SET
     #define UIS_SET         1


@@ -211,10 +218,36 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 #endif // defined __VISUALC__ && __VISUALC__ <= 1100
 
 // ----------------------------------------------------------------------------
 #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_FULLROWSELECT
     #define LVS_EX_FULLROWSELECT 0x00000020
 #endif


@@ -235,6 +268,9 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 #ifndef HDS_HOTTRACK
     #define HDS_HOTTRACK 4
 #endif
 #ifndef HDS_HOTTRACK
     #define HDS_HOTTRACK 4
 #endif

+#ifndef HDS_FLAT
+    #define HDS_FLAT 0x0200
+#endif

 
 #ifndef HDF_SORTUP
     #define HDF_SORTUP   0x0400
 
 #ifndef HDF_SORTUP
     #define HDF_SORTUP   0x0400


@@ -296,6 +332,7 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 
 #ifdef __DMC__
 
 
 #ifdef __DMC__
 

+#ifndef VER_NT_WORKSTATION

 typedef struct _OSVERSIONINFOEX {
     DWORD dwOSVersionInfoSize;
     DWORD dwMajorVersion;
 typedef struct _OSVERSIONINFOEX {
     DWORD dwOSVersionInfoSize;
     DWORD dwMajorVersion;


@@ -309,6 +346,7 @@ typedef struct _OSVERSIONINFOEX {
     BYTE  wProductType;
     BYTE  wReserved;
 } OSVERSIONINFOEX;
     BYTE  wProductType;
     BYTE  wReserved;
 } OSVERSIONINFOEX;

+#endif // !defined(VER_NT_WORKSTATION)

 
 #ifndef _TrackMouseEvent
     #define _TrackMouseEvent TrackMouseEvent
 
 #ifndef _TrackMouseEvent
     #define _TrackMouseEvent TrackMouseEvent


@@ -499,5 +537,9 @@ typedef struct
     #endif
 #endif  // defined __WINE__
 
     #endif
 #endif  // defined __WINE__
 

+#ifndef INVALID_FILE_ATTRIBUTES
+    #define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
+#endif
+

 #endif
     // _WX_MISSING_H_
 #endif
     // _WX_MISSING_H_