Add missing lines to setup.h.in. This properly fixes compilation under configure...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68477 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/gtk/webhistoryitem_webkit.h b/include/wx/gtk/webhistoryitem_webkit.h
index e82bcae5ef2656810365e5908b0f508fa2974204..444d0f4fe71ac7a37538963bdbcb2349a0b738b7 100644 (file)
--- a/include/wx/gtk/webhistoryitem_webkit.h
+++ b/include/wx/gtk/webhistoryitem_webkit.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_WEBVIEW_WEBKIT
+#if wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)

 
 #include "webkit/webkit.h"
 
 
 #include "webkit/webkit.h"
 


@@ -31,6 +31,6 @@ private:
     WebKitWebHistoryItem* m_histItem;
 };
 
     WebKitWebHistoryItem* m_histItem;
 };
 

-#endif // wxUSE_WEBVIEW_WEBKIT
+#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)

 
 #endif // _WX_GTK_WEBHISTORYITEM_H_
 
 #endif // _WX_GTK_WEBHISTORYITEM_H_

diff --git a/include/wx/msw/webhistoryitem_ie.h b/include/wx/msw/webhistoryitem_ie.h
index cbd547e5855a13aca44b3f94e91546cc66eceb2d..004eb0989af8eef26182f49862cefe2105aa38e5 100644 (file)
--- a/include/wx/msw/webhistoryitem_ie.h
+++ b/include/wx/msw/webhistoryitem_ie.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_WEBVIEW_IE
+#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)

 
 class WXDLLIMPEXP_WEB wxWebHistoryItem
 {
 
 class WXDLLIMPEXP_WEB wxWebHistoryItem
 {


@@ -26,6 +26,6 @@ private:
     wxString m_url, m_title;
 };
 
     wxString m_url, m_title;
 };
 

-#endif // wxUSE_WEBVIEW_IE
+#endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)

 
 #endif // _WX_MSW_WEBHISTORYITEM_H_
 
 #endif // _WX_MSW_WEBHISTORYITEM_H_

diff --git a/include/wx/msw/webview_ie.h b/include/wx/msw/webview_ie.h
index 938cf0ce41782fe27d844c63d980fe75317c9543..f7d560cc43aeb88d6e5f70da5480d9a974d47918 100644 (file)
--- a/include/wx/msw/webview_ie.h
+++ b/include/wx/msw/webview_ie.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_WEBVIEW_IE
+#if wxUSE_WEBVIEW_IE && defined(__WXMSW__)

 
 #include "wx/control.h"
 #include "wx/webview.h"
 
 #include "wx/control.h"
 #include "wx/webview.h"


@@ -243,6 +243,6 @@ private:
     wxWebHandler* m_handler;
 };
 
     wxWebHandler* m_handler;
 };
 

-#endif // wxUSE_WEBVIEW_IE
+#endif // wxUSE_WEBVIEW_IE && defined(__WXMSW__)

 
 #endif // wxWebViewIE_H
 
 #endif // wxWebViewIE_H

diff --git a/include/wx/osx/webhistoryitem_webkit.h b/include/wx/osx/webhistoryitem_webkit.h
index 5c500fb9d565070fd0c92eb7c8e71bf175afd1ae..aaec1848c7b59a3d781c941d334925ee715bac0f 100644 (file)
--- a/include/wx/osx/webhistoryitem_webkit.h
+++ b/include/wx/osx/webhistoryitem_webkit.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

-#if wxUSE_WEBVIEW_WEBKIT
+#if wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)

 
 class WXDLLIMPEXP_WEB wxWebHistoryItem
 {
 
 class WXDLLIMPEXP_WEB wxWebHistoryItem
 {


@@ -26,6 +26,6 @@ private:
     wxString m_url, m_title;
 };
 
     wxString m_url, m_title;
 };
 

-#endif // wxUSE_WEBVIEW_WEBKIT
+#endif // wxUSE_WEBVIEW_WEBKIT && defined(__WXOSX_MAC__)

 
 #endif // _WX_OSX_WEBHISTORYITEM_H_
 
 #endif // _WX_OSX_WEBHISTORYITEM_H_

diff --git a/setup.h.in b/setup.h.in
index 39a678f315b75312b7a038331f554caaed6c7572..54288e8af764bf7971607f719df681dd565de3fa 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -331,6 +331,12 @@
 
 #define wxUSE_STC 0
 
 
 #define wxUSE_STC 0
 

+#define wxUSE_WEB 0
+
+#define wxUSE_WEBVIEW_WEBKIT 0
+
+#define wxUSE_WEBVIEW_IE     0
+

 
 
 #ifdef _MSC_VER
 
 
 #ifdef _MSC_VER