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

Make callback names consistent

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

33
src/gtk/webview_webkit.cpp
View File

@@ -26,8 +26,9 @@ extern "C"
{ {
static void static void
wxgtk_webkitctrl_load_status_callback(GtkWidget* widget, GParamSpec*, wxgtk_webview_webkit_load_status(GtkWidget* widget,
wxWebViewWebKit *webKitCtrl) GParamSpec*,
wxWebViewWebKit *webKitCtrl)
{ {
if (!webKitCtrl->m_ready) return; if (!webKitCtrl->m_ready) return;
@@ -95,11 +96,11 @@ wxgtk_webview_webkit_navigation(WebKitWebView*,
} }
static gboolean static gboolean
wxgtk_webkitctrl_error (WebKitWebView*, wxgtk_webview_webkit_error(WebKitWebView*,
WebKitWebFrame*, WebKitWebFrame*,
gchar *uri, gchar *uri,
gpointer web_error, gpointer web_error,
wxWebViewWebKit* webKitWindow) wxWebViewWebKit* webKitWindow)
{ {
webKitWindow->m_busy = false; webKitWindow->m_busy = false;
wxWebNavigationError type = wxWEB_NAV_ERR_OTHER; wxWebNavigationError type = wxWEB_NAV_ERR_OTHER;
@@ -238,12 +239,12 @@ wxgtk_webkitctrl_error (WebKitWebView*,
} }
static gboolean static gboolean
wxgtk_webkitctrl_new_window(WebKitWebView*, wxgtk_webview_webkit_new_window(WebKitWebView*,
WebKitWebFrame *frame, WebKitWebFrame *frame,
WebKitNetworkRequest *request, WebKitNetworkRequest *request,
WebKitWebNavigationAction*, WebKitWebNavigationAction*,
WebKitWebPolicyDecision *policy_decision, WebKitWebPolicyDecision *policy_decision,
wxWebViewWebKit *webKitCtrl) wxWebViewWebKit *webKitCtrl)
{ {
const gchar* uri = webkit_network_request_get_uri(request); const gchar* uri = webkit_network_request_get_uri(request);
@@ -307,17 +308,17 @@ bool wxWebViewWebKit::Create(wxWindow *parent,
gtk_widget_show(web_view); gtk_widget_show(web_view);
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_webview_webkit_load_status),
this); this);
g_signal_connect_after(web_view, "navigation-policy-decision-requested", g_signal_connect_after(web_view, "navigation-policy-decision-requested",
G_CALLBACK(wxgtk_webview_webkit_navigation), 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_webview_webkit_error),
this); this);
g_signal_connect_after(web_view, "new-window-policy-decision-requested", g_signal_connect_after(web_view, "new-window-policy-decision-requested",
G_CALLBACK(wxgtk_webkitctrl_new_window), this); G_CALLBACK(wxgtk_webview_webkit_new_window), this);
m_parent->DoAddChild( this ); m_parent->DoAddChild( this );