From 726cc8697cd44a41b43257f05ca8cdd42b71a711 Mon Sep 17 00:00:00 2001
From: Steve Lamerton <steve.lamerton@gmail.com>
Date: Thu, 23 Jun 2011 20:44:19 +0000
Subject: [PATCH] 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
---
 include/wx/webview.h   |  2 +-
 samples/web/web.bkl    |  5 +++--
 src/msw/webview_ie.cpp | 14 +++++++-------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/include/wx/webview.h b/include/wx/webview.h
index 1d69d7ec60..f689e05caf 100644
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -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
 
diff --git a/samples/web/web.bkl b/samples/web/web.bkl
index 9c7fe77d9c..285b059c5f 100644
--- a/samples/web/web.bkl
+++ b/samples/web/web.bkl
@@ -9,10 +9,11 @@
             web.cpp
         </sources>
         <headers></headers>
+        <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>
-        <wx-lib>web</wx-lib>
-        <wx-lib>stc</wx-lib>
         <win32-res>../sample.rc</win32-res>
 		
 		<if cond="OUT_OF_TREE_MAKEFILES=='0'">
diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index d51a3e7f41..827425c325 100644
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -24,20 +24,19 @@
 #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_NAVIGATECOMPLETE2    252
-#define DISPID_NAVIGATEERROR        271
-#define OLECMDID_OPTICAL_ZOOM  63
+#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
 #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_SUPPRESSED 0x800C0400L
 
+#define REFRESH_NORMAL 0
 #define REFRESH_COMPLETELY 3
 #endif
 
-- 
2.47.2