Merge in from trunk r67662 to r64801

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 56339ee4025cd7816e0dfe2f53f6942fb63e96b9..16e4621baadc7011c232103a25586f85b1115f95 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


@@ -210,6 +217,28 @@ typedef struct wxtagNMLVCUSTOMDRAW_ {
 
 #endif // defined __VISUALC__ && __VISUALC__ <= 1100
 
 
 #endif // defined __VISUALC__ && __VISUALC__ <= 1100
 

+// ----------------------------------------------------------------------------
+// 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
 // ----------------------------------------------------------------------------
 // definitions related to ListView and Header common controls, needed by
 // msw/listctrl.cpp and msw/headerctrl.cpp


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


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


@@ -483,6 +514,77 @@ typedef struct
 
 #endif
 
 
 #endif
 

+#endif
+
+// Various definitions are missing from mingw
+// Used by webview_ie.cpp
+#ifdef __MINGW32__
+typedef enum CommandStateChangeConstants {
+    CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
+    CSC_NAVIGATEFORWARD = 0x1,
+    CSC_NAVIGATEBACK = 0x2
+} CommandStateChangeConstants;
+
+#define DISPID_COMMANDSTATECHANGE 105
+#define DISPID_NAVIGATECOMPLETE2 252
+#define DISPID_NAVIGATEERROR 271
+#define DISPID_NEWWINDOW3 273
+#define INET_E_ERROR_FIRST 0x800C0002L
+#define INET_E_INVALID_URL 0x800C0002L
+#define INET_E_NO_SESSION 0x800C0003L
+#define INET_E_CANNOT_CONNECT 0x800C0004L
+#define INET_E_RESOURCE_NOT_FOUND 0x800C0005L
+#define INET_E_OBJECT_NOT_FOUND 0x800C0006L
+#define INET_E_DATA_NOT_AVAILABLE 0x800C0007L
+#define INET_E_DOWNLOAD_FAILURE 0x800C0008L
+#define INET_E_AUTHENTICATION_REQUIRED 0x800C0009L
+#define INET_E_NO_VALID_MEDIA 0x800C000AL
+#define INET_E_CONNECTION_TIMEOUT 0x800C000BL
+#define INET_E_INVALID_REQUEST 0x800C000CL
+#define INET_E_UNKNOWN_PROTOCOL 0x800C000DL
+#define INET_E_SECURITY_PROBLEM 0x800C000EL
+#define INET_E_CANNOT_LOAD_DATA 0x800C000FL
+#define INET_E_CANNOT_INSTANTIATE_OBJECT 0x800C0010L
+#define INET_E_QUERYOPTION_UNKNOWN 0x800C0013L
+#define INET_E_REDIRECT_FAILED 0x800C0014L
+#define INET_E_REDIRECT_TO_DIR 0x800C0015L
+#define INET_E_CANNOT_LOCK_REQUEST 0x800C0016L
+#define INET_E_USE_EXTEND_BINDING 0x800C0017L
+#define INET_E_TERMINATED_BIND 0x800C0018L
+#define INET_E_INVALID_CERTIFICATE 0x800C0019L
+#define INET_E_CODE_DOWNLOAD_DECLINED 0x800C0100L
+#define INET_E_RESULT_DISPATCHED 0x800C0200L
+#define INET_E_CANNOT_REPLACE_SFP_FILE 0x800C0300L
+#define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY 0x800C0500L
+#define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
+
+#define REFRESH_NORMAL 0
+#define REFRESH_COMPLETELY 3
+#endif
+
+// For Visual C++ 6 and MinGW32. Used by webview_ie.cpp
+
+#if defined (__MINGW32__) || (_MSC_VER < 1300)
+enum
+{
+    OLECMDID_OPTICAL_ZOOM = 63
+}
+#endif
+
+#ifndef INET_E_INVALID_CERTIFICATE
+#define INET_E_INVALID_CERTIFICATE 0x800C0019L
+#endif
+
+#ifndef INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY
+#define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY 0x800C0500L
+#endif
+
+#ifndef INET_E_CODE_INSTALL_SUPPRESSED
+#define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
+#endif
+
+#ifndef DISPID_NEWWINDOW3
+#define DISPID_NEWWINDOW3 273

 #endif
 
  /*
 #endif
 
  /*


@@ -506,5 +608,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_