From bd7901aaec5b8188ff880008940b1fa244de9708 Mon Sep 17 00:00:00 2001
From: Steve Lamerton <steve.lamerton@gmail.com>
Date: Mon, 1 Aug 2011 10:10:20 +0000
Subject: [PATCH 1/1] Add missing lines to setup.h.in. This properly fixes
 compilation under configure based environments. Also update the include
 guards for the wxWebHistoryItem files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/gtk/webhistoryitem_webkit.h | 4 ++--
 include/wx/msw/webhistoryitem_ie.h     | 4 ++--
 include/wx/msw/webview_ie.h            | 4 ++--
 include/wx/osx/webhistoryitem_webkit.h | 4 ++--
 setup.h.in                             | 6 ++++++
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/include/wx/gtk/webhistoryitem_webkit.h b/include/wx/gtk/webhistoryitem_webkit.h
index e82bcae5ef..444d0f4fe7 100644
--- a/include/wx/gtk/webhistoryitem_webkit.h
+++ b/include/wx/gtk/webhistoryitem_webkit.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEBVIEW_WEBKIT
+#if wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
 #include "webkit/webkit.h"
 
@@ -31,6 +31,6 @@ private:
     WebKitWebHistoryItem* m_histItem;
 };
 
-#endif // wxUSE_WEBVIEW_WEBKIT
+#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
 #endif // _WX_GTK_WEBHISTORYITEM_H_
diff --git a/include/wx/msw/webhistoryitem_ie.h b/include/wx/msw/webhistoryitem_ie.h
index cbd547e585..004eb0989a 100644
--- a/include/wx/msw/webhistoryitem_ie.h
+++ b/include/wx/msw/webhistoryitem_ie.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEBVIEW_IE
+#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
 
 class WXDLLIMPEXP_WEB wxWebHistoryItem
 {
@@ -26,6 +26,6 @@ private:
     wxString m_url, m_title;
 };
 
-#endif // wxUSE_WEBVIEW_IE
+#endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)
 
 #endif // _WX_MSW_WEBHISTORYITEM_H_
diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index 938cf0ce41..f7d560cc43 100644
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEBVIEW_IE
+#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
 
 #include "wx/control.h"
 #include "wx/webview.h"
@@ -243,6 +243,6 @@ private:
     wxWebHandler* m_handler;
 };
 
-#endif // wxUSE_WEBVIEW_IE
+#endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)
 
 #endif // wxWebViewIE_H
diff --git a/include/wx/osx/webhistoryitem_webkit.h b/include/wx/osx/webhistoryitem_webkit.h
index 5c500fb9d5..aaec1848c7 100644
--- a/include/wx/osx/webhistoryitem_webkit.h
+++ b/include/wx/osx/webhistoryitem_webkit.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEBVIEW_WEBKIT
+#if wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)
 
 class WXDLLIMPEXP_WEB wxWebHistoryItem
 {
@@ -26,6 +26,6 @@ private:
     wxString m_url, m_title;
 };
 
-#endif // wxUSE_WEBVIEW_WEBKIT
+#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)
 
 #endif // _WX_OSX_WEBHISTORYITEM_H_
diff --git a/setup.h.in b/setup.h.in
index 39a678f315..54288e8af7 100644
--- a/setup.h.in
+++ b/setup.h.in
@@ -331,6 +331,12 @@
 
 #define wxUSE_STC 0
 
+#define wxUSE_WEB 0
+
+#define wxUSE_WEBVIEW_WEBKIT 0
+
+#define wxUSE_WEBVIEW_IE     0
+
 
 
 #ifdef _MSC_VER
-- 
2.45.2