From 882ecaa631faff07626c0e0d6a9bac95a2b5a456 Mon Sep 17 00:00:00 2001 From: Steve Lamerton Date: Wed, 14 Sep 2011 16:45:50 +0000 Subject: [PATCH] Use integral value for OLECMDID_OPTICAL_ZOOM as we cannot tell if an enum value is already defined or not. Fixes #13475 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/missing.h | 8 -------- src/msw/webview_ie.cpp | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index 6b2d1cd956..392d05679d 100644 --- 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 - -#if defined (__MINGW32__) || (_MSC_VER < 1300) -enum -{ - OLECMDID_OPTICAL_ZOOM = 63 -}; -#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 d76af6d707..824c71de29 100644 --- a/src/msw/webview_ie.cpp +++ b/src/msw/webview_ie.cpp @@ -235,7 +235,7 @@ void wxWebViewIE::SetIEOpticalZoom(wxWebViewZoom level) wxFAIL; } - HRESULT result = m_webBrowser->ExecWB((OLECMDID)OLECMDID_OPTICAL_ZOOM, + HRESULT result = m_webBrowser->ExecWB((OLECMDID)63 /*OLECMDID_OPTICAL_ZOOM*/, OLECMDEXECOPT_DODEFAULT, &zoomVariant, NULL); @@ -248,7 +248,7 @@ wxWebViewZoom wxWebViewIE::GetIEOpticalZoom() const 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); -- 2.45.2