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

Replace define for OLECMDID_OPTICAL_ZOOM with an enum to avoid errors in compilers that define it as such.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68325 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-22 09:34:46 +00:00
parent d363c7dbb0
commit a1ee9e64a5
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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