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

diff --git a/include/wx/webview.h b/include/wx/webview.h
index 1d69d7ec60ca9d4c708175a423e1d8e0d423879e..f689e05cafb287c82c9eeb74989746b0665986eb 100644 (file)
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -10,7 +10,7 @@
 #ifndef _WX_WEB_VIEW_H_
 #define _WX_WEB_VIEW_H_
 
 #ifndef _WX_WEB_VIEW_H_
 #define _WX_WEB_VIEW_H_
 

-#include "wx/defs.h"
+#include "wx/setup.h"

 
 #if wxUSE_WEB
 
 
 #if wxUSE_WEB
 

diff --git a/samples/web/web.bkl b/samples/web/web.bkl
index 9c7fe77d9c7af4e558254334f1983ef35b3caca0..285b059c5f135f9692cf7ecaeaf87a135c3e02de 100644 (file)
--- a/samples/web/web.bkl
+++ b/samples/web/web.bkl
@@ -9,10 +9,11 @@
             web.cpp\r
         </sources>\r
         <headers></headers>\r
             web.cpp\r
         </sources>\r
         <headers></headers>\r

+        <wx-lib>web</wx-lib>\r
+        <wx-lib>stc</wx-lib>       \r
+        <wx-lib>adv</wx-lib>\r

         <wx-lib>core</wx-lib>\r
         <wx-lib>base</wx-lib>\r
         <wx-lib>core</wx-lib>\r
         <wx-lib>base</wx-lib>\r

-        <wx-lib>web</wx-lib>\r
-        <wx-lib>stc</wx-lib>\r

         <win32-res>../sample.rc</win32-res>\r
                \r
                <if cond="OUT_OF_TREE_MAKEFILES=='0'">\r
         <win32-res>../sample.rc</win32-res>\r
                \r
                <if cond="OUT_OF_TREE_MAKEFILES=='0'">\r

diff --git a/src/msw/webview_ie.cpp b/src/msw/webview_ie.cpp
index d51a3e7f41449250e95c78438e154d6393a4f671..827425c3255eea0c56993d0f9cd2e9a7f90bccb8 100644 (file)
--- a/src/msw/webview_ie.cpp
+++ b/src/msw/webview_ie.cpp
@@ -24,20 +24,19 @@
 #include <exdisp.h>
 #include <mshtml.h>
 
 #include <exdisp.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 {
     CSC_UPDATECOMMANDS = (int) 0xFFFFFFFF,
     CSC_NAVIGATEFORWARD = 0x1,
     CSC_NAVIGATEBACK = 0x2
 } CommandStateChangeConstants;
 
 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
 #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 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
 
 #define REFRESH_COMPLETELY 3
 #endif