AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't include webkit headers from wx headers

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn 2011-11-17 01:23:03 +00:00
parent f559d1a23c
commit a0ff361188
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/gtk/webview_webkit.h
View File

@ -14,7 +14,6 @@
#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
#include "webkit/webkit.h"
#include "wx/sharedptr.h" #include "wx/sharedptr.h"
#include "wx/webview.h" #include "wx/webview.h"
@ -147,7 +146,7 @@ private:
void GTKOnFocus(wxFocusEvent& event); void GTKOnFocus(wxFocusEvent& event);
GtkWidget *web_view; GtkWidget *web_view;
gint m_historyLimit; int m_historyLimit;
wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList; wxVector<wxSharedPtr<wxWebViewHandler> > m_handlerList;

4
include/wx/gtk/webviewhistoryitem_webkit.h
View File

@ -14,8 +14,6 @@
#if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) #if wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)
#include "webkit/webkit.h"
class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
{ {
public: public:
@ -28,7 +26,7 @@ public:
private: private:
wxString m_url, m_title; wxString m_url, m_title;
WebKitWebHistoryItem* m_histItem; void* m_histItem;
}; };
#endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__) #endif // wxUSE_WEBVIEW && wxUSE_WEBVIEW_WEBKIT && defined(__WXGTK__)

4
src/gtk/webview_webkit.cpp
View File

@ -18,7 +18,7 @@
#include "wx/gtk/private.h" #include "wx/gtk/private.h"
#include "wx/filesys.h" #include "wx/filesys.h"
#include "wx/base64.h" #include "wx/base64.h"
#include "webkit/webkit.h" #include <webkit/webkit.h>
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// GTK callbacks // GTK callbacks
@ -598,7 +598,7 @@ wxVector<wxSharedPtr<wxWebViewHistoryItem> > wxWebViewWebKit::GetForwardHistory(
void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item) void wxWebViewWebKit::LoadHistoryItem(wxSharedPtr<wxWebViewHistoryItem> item)
{ {
WebKitWebHistoryItem* gtkitem = item->m_histItem; WebKitWebHistoryItem* gtkitem = (WebKitWebHistoryItem*)item->m_histItem;
if(gtkitem) if(gtkitem)
{ {
WebKitWebBackForwardList* history; WebKitWebBackForwardList* history;