From a0ff36118882acd393d51b3bc484780f091efbdb Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 17 Nov 2011 01:23:03 +0000
Subject: [PATCH] Don't include webkit headers from wx headers

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/gtk/webview_webkit.h            | 3 +--
 include/wx/gtk/webviewhistoryitem_webkit.h | 4 +---
 src/gtk/webview_webkit.cpp                 | 4 ++--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/include/wx/gtk/webview_webkit.h b/include/wx/gtk/webview_webkit.h
index f1aaead3a3..2cef91f1c6 100644
--- a/include/wx/gtk/webview_webkit.h
+++ b/include/wx/gtk/webview_webkit.h
@@ -14,7 +14,6 @@
 
 #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
-#include "webkit/webkit.h"
 #include "wx/sharedptr.h"
 #include "wx/webview.h"
 
@@ -147,7 +146,7 @@ private:
     void GTKOnFocus(wxFocusEvent& event);
 
     GtkWidget *web_view;
-    gint m_historyLimit;
+    int m_historyLimit;
 
     wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList;
 
diff --git a/include/wx/gtk/webviewhistoryitem_webkit.h b/include/wx/gtk/webviewhistoryitem_webkit.h
index b0a2de1863..90b2c9751a 100644
--- a/include/wx/gtk/webviewhistoryitem_webkit.h
+++ b/include/wx/gtk/webviewhistoryitem_webkit.h
@@ -14,8 +14,6 @@
 
 #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
 
-#include "webkit/webkit.h"
-
 class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
 {
 public:
@@ -28,7 +26,7 @@ public:
 
 private:
     wxString m_url, m_title;
-    WebKitWebHistoryItem* m_histItem;
+    void* m_histItem;
 };
 
 #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp
index 08199cd778..2ece822c18 100644
--- a/src/gtk/webview_webkit.cpp
+++ b/src/gtk/webview_webkit.cpp
@@ -18,7 +18,7 @@
 #include "wx/gtk/private.h"
 #include "wx/filesys.h"
 #include "wx/base64.h"
-#include "webkit/webkit.h"
+#include <webkit/webkit.h>
 
 // ----------------------------------------------------------------------------
 // GTK callbacks
@@ -598,7 +598,7 @@ wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory(
 
 void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
 {
-    WebKitWebHistoryItem* gtkitem = item->m_histItem;
+    WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)item->m_histItem;
     if(gtkitem)
     {
         WebKitWebBackForwardList* history;
-- 
2.45.2