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

Fix a number of mingw compile errors.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68030 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-06-23 20:44:19 +00:00
parent 324c132b1e
commit 726cc8697c
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/webview.h
View File

@@ -10,7 +10,7 @@
#ifndef _WX_WEB_VIEW_H_ #ifndef _WX_WEB_VIEW_H_
#define _WX_WEB_VIEW_H_ #define _WX_WEB_VIEW_H_
#include "wx/defs.h" #include "wx/setup.h"
#if wxUSE_WEB #if wxUSE_WEB

5
samples/web/web.bkl
View File

@@ -9,10 +9,11 @@
web.cpp web.cpp
</sources> </sources>
<headers></headers> <headers></headers>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
<wx-lib>web</wx-lib> <wx-lib>web</wx-lib>
<wx-lib>stc</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> <win32-res>../sample.rc</win32-res>
<if cond="OUT_OF_TREE_MAKEFILES=='0'"> <if cond="OUT_OF_TREE_MAKEFILES=='0'">

14
src/msw/webview_ie.cpp
View File

@@ -24,20 +24,19 @@
#include <exdisp.h> #include <exdisp.h>
#include <mshtml.h> #include <mshtml.h>
// Various definitions are missing from mingw
#ifdef __MINGW32__ #ifdef __MINGW32__
// FIXME: Seems like MINGW does not have these, how to handle cleanly?
#define DISPID_COMMANDSTATECHANGE 105
typedef enum CommandStateChangeConstants { typedef enum CommandStateChangeConstants {
CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF, CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
CSC_NAVIGATEFORWARD = 0x1, CSC_NAVIGATEFORWARD = 0x1,
CSC_NAVIGATEBACK = 0x2 CSC_NAVIGATEBACK = 0x2
} CommandStateChangeConstants; } CommandStateChangeConstants;
#define DISPID_COMMANDSTATECHANGE 105
// FIXME: Seems like MINGW does not have these, how to handle cleanly? #define DISPID_NAVIGATECOMPLETE2 252
#define DISPID_NAVIGATECOMPLETE2 252 #define DISPID_NAVIGATEERROR 271
#define DISPID_NAVIGATEERROR 271 #define DISPID_NEWWINDOW3 273
#define OLECMDID_OPTICAL_ZOOM 63 #define OLECMDID_OPTICAL_ZOOM 63
#define INET_E_ERROR_FIRST 0x800C0002L #define INET_E_ERROR_FIRST 0x800C0002L
#define INET_E_INVALID_URL 0x800C0002L #define INET_E_INVALID_URL 0x800C0002L
#define INET_E_NO_SESSION 0x800C0003L #define INET_E_NO_SESSION 0x800C0003L
@@ -67,6 +66,7 @@ typedef enum CommandStateChangeConstants {
#define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY 0x800C0500L #define INET_E_CODE_INSTALL_BLOCKED_BY_HASH_POLICY 0x800C0500L
#define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L #define INET_E_CODE_INSTALL_SUPPRESSED 0x800C0400L
#define REFRESH_NORMAL 0
#define REFRESH_COMPLETELY 3 #define REFRESH_COMPLETELY 3
#endif #endif