Use integral value for OLECMDID_OPTICAL_ZOOM as we cannot tell if an enum value is...

Fixes #13475

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h
index 6b2d1cd956e62f8f7de3bccc4f2afca6cbb7630b..392d05679dcb65e908ea9be34d0bed4933e6ceb7 100644 (file)
--- a/include/wx/msw/missing.h
+++ b/include/wx/msw/missing.h
@@ -563,14 +563,6 @@ typedef enum CommandStateChangeConstants {
 #endif
 
 // For Visual C++ 6 and MinGW32. Used by webview_ie.cpp
 #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_INVALID_CERTIFICATE
 #define INET_E_INVALID_CERTIFICATE 0x800C0019L
 #endif

diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index d76af6d707c98db107c9fef4e14232527330d1ab..824c71de29e4bde1c574a65b0a91256b05787684 100644 (file)
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -235,7 +235,7 @@ void wxWebViewIE::SetIEOpticalZoom(wxWebViewZoom level)
             wxFAIL;
     }
 
             wxFAIL;
     }
 

-    HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
+    HRESULT result = m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,

                                           OLECMDEXECOPT_DODEFAULT,
                                           &zoomVariant,
                                           NULL);
                                           OLECMDEXECOPT_DODEFAULT,
                                           &zoomVariant,
                                           NULL);


@@ -248,7 +248,7 @@ wxWebViewZoom wxWebViewIE::GetIEOpticalZoom() const
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
 
     VariantInit (&zoomVariant);
     V_VT(&zoomVariant) = VT_I4;
 

-    HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM,
+    HRESULT result = m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/,

                                           OLECMDEXECOPT_DODEFAULT, NULL,
                                           &zoomVariant);
     wxASSERT(result == S_OK);
                                           OLECMDEXECOPT_DODEFAULT, NULL,
                                           &zoomVariant);
     wxASSERT(result == S_OK);