When handling accelerators in wxWebView make sure that we do not block right-alt...

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

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 8018403dda319160f3286f251fa19be028c94d53..9efb9f6ab58753ce504b9ef6486625615a3379f3 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -77,6 +77,9 @@
     #ifndef WM_MOUSEWHEEL
         #define WM_MOUSEWHEEL           0x020A
     #endif
+    #ifndef WM_MOUSEHWHEEL
+        #define WM_MOUSEHWHEEL          0x020E
+    #endif
     #ifndef WHEEL_DELTA
         #define WHEEL_DELTA             120
     #endif
@@ -94,6 +97,7 @@
     #define VK_OEM_5        0xDC
     #define VK_OEM_6        0xDD
     #define VK_OEM_7        0xDE
+    #define VK_OEM_102      0xE2
 #endif
 
 #ifndef VK_OEM_COMMA
@@ -518,13 +522,6 @@ typedef struct
 
 //Various defines that will be needed by mingw and possibly VC++6
 //Used by the webview library
-#ifdef __MINGW32__
-typedef enum CommandStateChangeConstants {
-    CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
-    CSC_NAVIGATEFORWARD = 0x1,
-    CSC_NAVIGATEBACK = 0x2
-} CommandStateChangeConstants;
-#endif
 
 #ifndef DISPID_COMMANDSTATECHANGE
 #define DISPID_COMMANDSTATECHANGE 105
@@ -654,131 +651,23 @@ typedef enum CommandStateChangeConstants {
 #define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
 #endif
 
-//We need to check if we are using MinGW which doesn't inlcude the urlmon
-//defintions as opposed to MinGW-64 which does
+#ifndef MUI_LANGUAGE_NAME
+#define MUI_LANGUAGE_NAME 0x8
+#endif
+
+//We need to check if we are using MinGW or mingw-w64 as their
+//definitions are different
 
 #ifdef __MINGW32__
 #include <_mingw.h>
 #endif
 
-//Definitions from w64 mingw-runtime package, in the public domain
-//Used by webview
 #if defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
-
-#define REFRESH_NORMAL 0
-#define REFRESH_COMPLETELY 3
-
-EXTERN_C const IID CLSID_FileProtocol;
-
-DEFINE_GUID(IID_IInternetProtocolRoot,0x79eac9e3,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-DEFINE_GUID(IID_IInternetProtocol,0x79eac9e4,0xbaf9,0x11ce,0x8c,0x82,0,0xaa,0,0x4b,0xa9,0xb);
-
-typedef enum __MIDL_IBindStatusCallback_0006 
-{
-    BSCF_FIRSTDATANOTIFICATION = 0x1,
-    BSCF_INTERMEDIATEDATANOTIFICATION = 0x2,
-    BSCF_LASTDATANOTIFICATION = 0x4,
-    BSCF_DATAFULLYAVAILABLE = 0x8,
-    BSCF_AVAILABLEDATASIZEUNKNOWN = 0x10
-}   BSCF;
-
-typedef struct _tagPROTOCOLDATA
-{
-    DWORD grfFlags;
-    DWORD dwState;
-    LPVOID pData;
-    ULONG cbData;
-}   PROTOCOLDATA;
-
-typedef struct _tagBINDINFO
-{
-    ULONG cbSize;
-    LPWSTR szExtraInfo;
-    STGMEDIUM stgmedData;
-    DWORD grfBindInfoF;
-    DWORD dwBindVerb;
-    LPWSTR szCustomVerb;
-    DWORD cbstgmedData;
-    DWORD dwOptions;
-    DWORD dwOptionsFlags;
-    DWORD dwCodePage;
-    SECURITY_ATTRIBUTES securityAttributes;
-    IID iid;
-    IUnknown *pUnk;
-    DWORD dwReserved;
-}   BINDINFO;
-
-
-struct IInternetBindInfo : public IUnknown
-{
-public:
-    virtual HRESULT WINAPI GetBindInfo(DWORD *grfBINDF,BINDINFO *pbindinfo) = 0;
-    virtual HRESULT WINAPI GetBindString(ULONG ulStringType,LPOLESTR *ppwzStr,
-                                         ULONG cEl,ULONG *pcElFetched) = 0;
-};
-
-struct IInternetProtocolSink : public IUnknown
-{
-public:
-    virtual HRESULT WINAPI Switch(PROTOCOLDATA *pProtocolData) = 0;
-    virtual HRESULT WINAPI ReportProgress(ULONG ulStatusCode,
-                                          LPCWSTR szStatusText) = 0;
-    virtual HRESULT WINAPI ReportData(DWORD grfBSCF,ULONG ulProgress,
-                                      ULONG ulProgressMax) = 0;
-    virtual HRESULT WINAPI ReportResult(HRESULT hrResult,DWORD dwError,
-                                        LPCWSTR szResult) = 0;
-};
-
-struct IInternetProtocolRoot : public IUnknown
-{
-public:
-    virtual HRESULT WINAPI Start(LPCWSTR szUrl,IInternetProtocolSink *pOIProtSink,
-                                 IInternetBindInfo *pOIBindInfo,DWORD grfPI,
-                                 HANDLE_PTR dwReserved) = 0;
-    virtual HRESULT WINAPI Continue(PROTOCOLDATA *pProtocolData) = 0;
-    virtual HRESULT WINAPI Abort(HRESULT hrReason,DWORD dwOptions) = 0;
-    virtual HRESULT WINAPI Terminate(DWORD dwOptions) = 0;
-    virtual HRESULT WINAPI Suspend(void) = 0;
-    virtual HRESULT WINAPI Resume(void) = 0;
-};
-
-struct IInternetProtocol : public IInternetProtocolRoot
-{
-public:
-    virtual HRESULT WINAPI Read(void *pv,ULONG cb,ULONG *pcbRead) = 0;
-    virtual HRESULT WINAPI Seek(LARGE_INTEGER dlibMove,DWORD dwOrigin,
-                                ULARGE_INTEGER *plibNewPosition) = 0;
-    virtual HRESULT WINAPI LockRequest(DWORD dwOptions) = 0;
-    virtual HRESULT WINAPI UnlockRequest(void) = 0;
-};
-
-struct IInternetSession : public IUnknown
-{
-  public:
-    virtual HRESULT WINAPI RegisterNameSpace(IClassFactory *pCF,REFCLSID rclsid,
-                                             LPCWSTR pwzProtocol,
-                                             ULONG cPatterns,
-                                             const LPCWSTR *ppwzPatterns,
-                                             DWORD dwReserved) = 0;
-    virtual HRESULT WINAPI UnregisterNameSpace(IClassFactory *pCF,
-                                               LPCWSTR pszProtocol) = 0;
-    virtual HRESULT WINAPI RegisterMimeFilter(IClassFactory *pCF,
-                                              REFCLSID rclsid,
-                                              LPCWSTR pwzType) = 0;
-    virtual HRESULT WINAPI UnregisterMimeFilter(IClassFactory *pCF,
-                                                LPCWSTR pwzType) = 0;
-    virtual HRESULT WINAPI CreateBinding(LPBC pBC,LPCWSTR szUrl,
-                                         IUnknown *pUnkOuter,IUnknown **ppUnk,
-                                         IInternetProtocol **ppOInetProt,
-                                         DWORD dwOption) = 0;
-    virtual HRESULT WINAPI SetSessionOption(DWORD dwOption,LPVOID pBuffer,
-                                            DWORD dwBufferLength,
-                                            DWORD dwReserved) = 0;
-    virtual HRESULT WINAPI GetSessionOption(DWORD dwOption,LPVOID pBuffer,
-                                            DWORD *pdwBufferLength,
-                                            DWORD dwReserved) = 0;
-};
-
+typedef enum CommandStateChangeConstants {
+    CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
+    CSC_NAVIGATEFORWARD = 0x1,
+    CSC_NAVIGATEBACK = 0x2
+} CommandStateChangeConstants;
 #endif
 
  /*