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

Use the newer and recommended callback for handling navigation requests in WebKitGTK+.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-07-18 09:37:14 +00:00
parent 1d7d04d77f
commit 780f726226
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gtk/webview_webkit.cpp
View File

@@ -60,11 +60,13 @@ wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec*,
} }
} }
static WebKitNavigationResponse static gboolean
wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView*, wxgtk_webview_webkit_navigation(WebKitWebView*,
WebKitWebFrame *frame, WebKitWebFrame *frame,
WebKitNetworkRequest *request, WebKitNetworkRequest *request,
wxWebViewWebKit *webKitCtrl) WebKitWebNavigationAction*,
WebKitWebPolicyDecision *policy_decision,
wxWebViewWebKit *webKitCtrl)
{ {
webKitCtrl->m_busy = true; webKitCtrl->m_busy = true;
@@ -83,11 +85,12 @@ wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView*,
if (thisEvent.IsVetoed()) if (thisEvent.IsVetoed())
{ {
webKitCtrl->m_busy = false; webKitCtrl->m_busy = false;
return WEBKIT_NAVIGATION_RESPONSE_IGNORE; webkit_web_policy_decision_ignore(policy_decision);
return TRUE;
} }
else else
{ {
return WEBKIT_NAVIGATION_RESPONSE_ACCEPT; return FALSE;
} }
} }
@@ -306,8 +309,8 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
g_signal_connect_after(web_view, "notify::load-status", g_signal_connect_after(web_view, "notify::load-status",
G_CALLBACK(wxgtk_webkitctrl_load_status_callback), G_CALLBACK(wxgtk_webkitctrl_load_status_callback),
this); this);
g_signal_connect_after(web_view, "navigation-requested", g_signal_connect_after(web_view, "navigation-policy-decision-requested",
G_CALLBACK(wxgtk_webkitctrl_navigation_requ_callback), G_CALLBACK(wxgtk_webview_webkit_navigation),
this); this);
g_signal_connect_after(web_view, "load-error", g_signal_connect_after(web_view, "load-error",
G_CALLBACK(wxgtk_webkitctrl_error), G_CALLBACK(wxgtk_webkitctrl_error),