Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use integral value for OLECMDID_OPTICAL_ZOOM as we cannot tell if an enum value is already defined or not.

Browse Source 
Fixes #13475

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-09-14 16:45:50 +00:00
parent 8240dea400
commit 882ecaa631
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/msw/missing.h
View File

@@ -563,14 +563,6 @@ typedef enum CommandStateChangeConstants {
#endif #endif
// For Visual C++ 6 and MinGW32. Used by webview_ie.cpp // 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 #ifndef INET_E_INVALID_CERTIFICATE
#define INET_E_INVALID_CERTIFICATE 0x800C0019L #define INET_E_INVALID_CERTIFICATE 0x800C0019L
#endif #endif

4
src/msw/webview_ie.cpp
View File

@@ -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, OLECMDEXECOPT_DODEFAULT,
&zoomVariant, &zoomVariant,
NULL); NULL);
@@ -248,7 +248,7 @@ wxWebViewZoom wxWebViewIE::GetIEOpticalZoom() const
VariantInit (&zoomVariant); VariantInit (&zoomVariant);
V_VT(&zoomVariant) = VT_I4; 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, OLECMDEXECOPT_DODEFAULT, NULL,
&zoomVariant); &zoomVariant);
wxASSERT(result == S_OK); wxASSERT(result == S_OK);