From 780f726226d58d79799da39f0783621ac63c04f1 Mon Sep 17 00:00:00 2001 From: Steve Lamerton Date: Mon, 18 Jul 2011 09:37:14 +0000 Subject: [PATCH] Use the newer and recommended callback for handling navigation requests in WebKitGTK+. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68297 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/webview_webkit.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/gtk/webview_webkit.cpp b/src/gtk/webview_webkit.cpp index d1aed673fa..6e6096bf37 100644 --- a/src/gtk/webview_webkit.cpp +++ b/src/gtk/webview_webkit.cpp @@ -60,11 +60,13 @@ wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec*, } } -static WebKitNavigationResponse -wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView*, - WebKitWebFrame *frame, - WebKitNetworkRequest *request, - wxWebViewWebKit *webKitCtrl) +static gboolean +wxgtk_webview_webkit_navigation(WebKitWebView*, + WebKitWebFrame *frame, + WebKitNetworkRequest *request, + WebKitWebNavigationAction*, + WebKitWebPolicyDecision *policy_decision, + wxWebViewWebKit *webKitCtrl) { webKitCtrl->m_busy = true; @@ -83,11 +85,12 @@ wxgtk_webkitctrl_navigation_requ_callback(WebKitWebView*, if (thisEvent.IsVetoed()) { webKitCtrl->m_busy = false; - return WEBKIT_NAVIGATION_RESPONSE_IGNORE; + webkit_web_policy_decision_ignore(policy_decision); + return TRUE; } 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_CALLBACK(wxgtk_webkitctrl_load_status_callback), this); - g_signal_connect_after(web_view, "navigation-requested", - G_CALLBACK(wxgtk_webkitctrl_navigation_requ_callback), + g_signal_connect_after(web_view, "navigation-policy-decision-requested", + G_CALLBACK(wxgtk_webview_webkit_navigation), this); g_signal_connect_after(web_view, "load-error", G_CALLBACK(wxgtk_webkitctrl_error), -- 2.47.2