From a1ee9e64a5b548dbbcf07c765a3a80c501850154 Mon Sep 17 00:00:00 2001 From: Steve Lamerton Date: Fri, 22 Jul 2011 09:34:46 +0000 Subject: [PATCH] Replace define for OLECMDID_OPTICAL_ZOOM with an enum to avoid errors in compilers that define it as such. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/msw/missing.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/wx/msw/missing.h b/include/wx/msw/missing.h index d52fb0a718..16e4621baa 100644 --- a/include/wx/msw/missing.h +++ b/include/wx/msw/missing.h @@ -529,7 +529,6 @@ typedef enum CommandStateChangeConstants { #define DISPID_NAVIGATECOMPLETE2 252 #define DISPID_NAVIGATEERROR 271 #define DISPID_NEWWINDOW3 273 -#define OLECMDID_OPTICAL_ZOOM 63 #define INET_E_ERROR_FIRST 0x800C0002L #define INET_E_INVALID_URL 0x800C0002L #define INET_E_NO_SESSION 0x800C0003L @@ -565,8 +564,11 @@ typedef enum CommandStateChangeConstants { // For Visual C++ 6 and MinGW32. Used by webview_ie.cpp -#ifndef OLECMDID_OPTICAL_ZOOM -#define OLECMDID_OPTICAL_ZOOM 63 +#if defined (__MINGW32__) || (_MSC_VER < 1300) +enum +{ + OLECMDID_OPTICAL_ZOOM = 63 +} #endif #ifndef INET_E_INVALID_CERTIFICATE -- 2.45.2