Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix various gtk webkit warnings.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68224 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-11 12:52:07 +00:00
parent 7fbc727b20
commit 3dffc2aea2
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,6 +110,8 @@ public:
virtual wxString GetCurrentURL(); virtual wxString GetCurrentURL();
virtual wxString GetCurrentTitle(); virtual wxString GetCurrentTitle();
virtual wxString GetPageSource(); virtual wxString GetPageSource();
//We do not want to hide the other overloads
using wxWebView::SetPage;
virtual void SetPage(const wxString& html, const wxString& baseUrl); virtual void SetPage(const wxString& html, const wxString& baseUrl);
virtual void Print(); virtual void Print();
virtual bool IsBusy(); virtual bool IsBusy();

12
src/gtk/webview_webkit.cpp
View File

@@ -26,7 +26,7 @@ extern "C"
{ {
static void static void
wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec* arg1, wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec*,
wxWebViewWebKit *webKitCtrl) wxWebViewWebKit *webKitCtrl)
{ {
if (!webKitCtrl->m_ready) return; if (!webKitCtrl->m_ready) return;
@@ -61,7 +61,7 @@ wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec* arg1,
} }
static WebKitNavigationResponse static WebKitNavigationResponse
wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView *web_view, wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView*,
WebKitWebFrame *frame, WebKitWebFrame *frame,
WebKitNetworkRequest *request, WebKitNetworkRequest *request,
wxWebViewWebKit *webKitCtrl) wxWebViewWebKit *webKitCtrl)
@@ -92,8 +92,8 @@ wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView *web_view,
} }
static gboolean static gboolean
wxgtk_webkitctrl_error (WebKitWebView *web_view, wxgtk_webkitctrl_error (WebKitWebView*,
WebKitWebFrame *web_frame, WebKitWebFrame*,
gchar *uri, gchar *uri,
gpointer web_error, gpointer web_error,
wxWebViewWebKit* webKitWindow) wxWebViewWebKit* webKitWindow)
@@ -235,10 +235,10 @@ wxgtk_webkitctrl_error (WebKitWebView *web_view,
} }
static gboolean static gboolean
wxgtk_webkitctrl_new_window(WebKitWebView *webView, wxgtk_webkitctrl_new_window(WebKitWebView*,
WebKitWebFrame *frame, WebKitWebFrame *frame,
WebKitNetworkRequest *request, WebKitNetworkRequest *request,
WebKitWebNavigationAction *navigation_action, WebKitWebNavigationAction*,
WebKitWebPolicyDecision *policy_decision, WebKitWebPolicyDecision *policy_decision,
wxWebViewWebKit *webKitCtrl) wxWebViewWebKit *webKitCtrl)
{ {