Fix a number of mingw compile errors.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
#ifndef _WX_WEB_VIEW_H_
|
||||
#define _WX_WEB_VIEW_H_
|
||||
|
||||
#include "wx/defs.h"
|
||||
#include "wx/setup.h"
|
||||
|
||||
#if wxUSE_WEB
|
||||
|
||||
|
@@ -9,10 +9,11 @@
|
||||
web.cpp
|
||||
</sources>
|
||||
<headers></headers>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
<wx-lib>web</wx-lib>
|
||||
<wx-lib>stc</wx-lib>
|
||||
<wx-lib>adv</wx-lib>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
<win32-res>../sample.rc</win32-res>
|
||||
|
||||
<if cond="OUT_OF_TREE_MAKEFILES=='0'">
|
||||
|
@@ -24,19 +24,18 @@
|
||||
#include <exdisp.h>
|
||||
#include <mshtml.h>
|
||||
|
||||
// Various definitions are missing from mingw
|
||||
#ifdef __MINGW32__
|
||||
// FIXME: Seems like MINGW does not have these, how to handle cleanly?
|
||||
#define DISPID_COMMANDSTATECHANGE 105
|
||||
typedef enum CommandStateChangeConstants {
|
||||
CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
|
||||
CSC_NAVIGATEFORWARD = 0x1,
|
||||
CSC_NAVIGATEBACK = 0x2
|
||||
} CommandStateChangeConstants;
|
||||
|
||||
|
||||
// FIXME: Seems like MINGW does not have these, how to handle cleanly?
|
||||
#define DISPID_COMMANDSTATECHANGE 105
|
||||
#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
|
||||
@@ -67,6 +66,7 @@ typedef enum CommandStateChangeConstants {
|
||||
#define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY 0x800C0500L
|
||||
#define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
|
||||
|
||||
#define REFRESH_NORMAL 0
|
||||
#define REFRESH_COMPLETELY 3
|
||||
#endif
|
||||
|
||||
|
Reference in New Issue
Block a user